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

added photo switch by scroll gestures for os x in mediaview

This commit is contained in:
John Preston 2014-12-17 20:55:32 +03:00
parent dec5db074c
commit 7c20e4773d
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Telegram/SourceFiles/mediaview.cpp
View File

@ -1194,6 +1194,23 @@ bool MediaView::event(QEvent *e) {
return true; return true;
} }
} }
} else if (e->type() == QEvent::Wheel) {
QWheelEvent *ev = static_cast<QWheelEvent*>(e);
if (ev->phase() == Qt::ScrollBegin) {
_accumScroll = ev->angleDelta();
LOG(("Scrolling begin: %1 sum %2").arg(ev->angleDelta().x()).arg(_accumScroll.x()));
} else {
_accumScroll += ev->angleDelta();
if (ev->phase() == Qt::ScrollEnd) {
LOG(("Scrolling end: %1 sum %2").arg(ev->angleDelta().x()).arg(_accumScroll.x()));
if (ev->orientation() == Qt::Horizontal) {
if (_accumScroll.x() * _accumScroll.x() > _accumScroll.y() * _accumScroll.y() && _accumScroll.x() != 0) {
moveToPhoto(_accumScroll.x() > 0 ? -1 : 1);
}
_accumScroll = QPoint();
}
}
}
} }
return QWidget::event(e); return QWidget::event(e);
} }

1
Telegram/SourceFiles/mediaview.h
View File

@ -135,6 +135,7 @@ private:
bool _touchPress, _touchMove, _touchRightButton; bool _touchPress, _touchMove, _touchRightButton;
QTimer _touchTimer; QTimer _touchTimer;
QPoint _touchStart; QPoint _touchStart;
QPoint _accumScroll;
QString _saveMsgFilename; QString _saveMsgFilename;
uint64 _saveMsgStarted; uint64 _saveMsgStarted;

2
Telegram/_qt_5_3_1_patch/qtbase/src/plugins/platforms/cocoa/qnsview.mm
View File

@ -1248,7 +1248,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) { if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
// On 10.8 and above, MayBegin is likely to happen. We treat it the same as an actual begin. // On 10.8 and above, MayBegin is likely to happen. We treat it the same as an actual begin.
if (phase == NSEventPhaseMayBegin) if (phase == NSEventPhaseMayBegin || phase == NSEventPhaseBegan)
ph = Qt::ScrollBegin; ph = Qt::ScrollBegin;
} else } else
#endif #endif