procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

added media overview to linux version, fixed scroll, smooth photos overview thumbs

This commit is contained in:
John Preston 2014-08-15 16:19:18 +04:00
parent a4728238bb
commit 5ebe0056dd
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -65,9 +65,9 @@ QPixmap OverviewInner::genPix(PhotoData *photo, int32 size) {
size *= cIntRetinaFactor(); size *= cIntRetinaFactor();
QImage img = (photo->full->loaded() ? photo->full : (photo->medium->loaded() ? photo->medium : photo->thumb))->pix().toImage(); QImage img = (photo->full->loaded() ? photo->full : (photo->medium->loaded() ? photo->medium : photo->thumb))->pix().toImage();
if (img.width() > img.height()) { if (img.width() > img.height()) {
img = img.scaled(img.width() * size / img.height(), size, Qt::KeepAspectRatioByExpanding, Qt::FastTransformation); img = img.scaled(img.width() * size / img.height(), size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
} else { } else {
img = img.scaled(size, img.height() * size / img.width(), Qt::KeepAspectRatioByExpanding, Qt::FastTransformation); img = img.scaled(size, img.height() * size / img.width(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation);
} }
img.setDevicePixelRatio(cRetinaFactor()); img.setDevicePixelRatio(cRetinaFactor());
photo->forget(); photo->forget();
@ -377,14 +377,17 @@ void OverviewInner::contextMenuEvent(QContextMenuEvent *e) {
int32 OverviewInner::resizeToWidth(int32 nwidth, int32 scrollTop, int32 minHeight) { int32 OverviewInner::resizeToWidth(int32 nwidth, int32 scrollTop, int32 minHeight) {
if (width() == nwidth && minHeight == _minHeight) return scrollTop; if (width() == nwidth && minHeight == _minHeight) return scrollTop;
_minHeight = minHeight; _minHeight = minHeight;
if (_resizeIndex < 0) { if (_type == OverviewPhotos && _resizeIndex < 0) {
_resizeIndex = _photosInRow * (scrollTop / int32(_vsize + st::overviewPhotoSkip)); _resizeIndex = _photosInRow * (scrollTop / int32(_vsize + st::overviewPhotoSkip));
_resizeSkip = scrollTop - (scrollTop / int32(_vsize + st::overviewPhotoSkip)) * int32(_vsize + st::overviewPhotoSkip); _resizeSkip = scrollTop - (scrollTop / int32(_vsize + st::overviewPhotoSkip)) * int32(_vsize + st::overviewPhotoSkip);
} }
resize(nwidth, height() > _minHeight ? height() : _minHeight); resize(nwidth, height() > _minHeight ? height() : _minHeight);
showAll(); showAll();
int32 newRow = _resizeIndex / _photosInRow; if (_type == OverviewPhotos) {
return newRow * int32(_vsize + st::overviewPhotoSkip) + _resizeSkip; int32 newRow = _resizeIndex / _photosInRow;
return newRow * int32(_vsize + st::overviewPhotoSkip) + _resizeSkip;
}
return scrollTop;
} }
void OverviewInner::dropResizeIndex() { void OverviewInner::dropResizeIndex() {
@ -674,7 +677,10 @@ void OverviewWidget::paintEvent(QPaintEvent *e) {
} }
void OverviewWidget::scrollBy(int32 add) { void OverviewWidget::scrollBy(int32 add) {
bool wasHidden = _scroll.isHidden();
if (wasHidden) _scroll.show();
_scroll.scrollToY(_scroll.scrollTop() + add); _scroll.scrollToY(_scroll.scrollTop() + add);
if (wasHidden) _scroll.hide();
} }
void OverviewWidget::paintTopBar(QPainter &p, float64 over, int32 decreaseWidth) { void OverviewWidget::paintTopBar(QPainter &p, float64 over, int32 decreaseWidth) {

2
Telegram/Telegram.pro
View File

@ -89,6 +89,7 @@ SOURCES += \
./SourceFiles/langloaderplain.cpp \ ./SourceFiles/langloaderplain.cpp \
./SourceFiles/layerwidget.cpp \ ./SourceFiles/layerwidget.cpp \
./SourceFiles/mediaview.cpp \ ./SourceFiles/mediaview.cpp \
./SourceFiles/overviewwidget.cpp \
./SourceFiles/profilewidget.cpp \ ./SourceFiles/profilewidget.cpp \
./SourceFiles/localimageloader.cpp \ ./SourceFiles/localimageloader.cpp \
./SourceFiles/logs.cpp \ ./SourceFiles/logs.cpp \
@ -158,6 +159,7 @@ HEADERS += \
./SourceFiles/langloaderplain.h \ ./SourceFiles/langloaderplain.h \
./SourceFiles/layerwidget.h \ ./SourceFiles/layerwidget.h \
./SourceFiles/mediaview.h \ ./SourceFiles/mediaview.h \
./SourceFiles/overviewwidget.h \
./SourceFiles/profilewidget.h \ ./SourceFiles/profilewidget.h \
./SourceFiles/localimageloader.h \ ./SourceFiles/localimageloader.h \
./SourceFiles/logs.h \ ./SourceFiles/logs.h \