office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-25 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression in Ctrl+Wheel zoom when using the touchpad

Browse source 
For some reason Qt started sending mouse move events after all wheel
events so only reset the delta when the mouse move event represents an
actual move
This commit is contained in:
Albert Astals Cid 2018-12-06 00:24:39 +01:00
parent 22c5ceae7f
commit ba1c2beb70
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ui/pageview.cpp
View file

@ -145,6 +145,7 @@ public:
QPoint mouseGrabPos;
QPoint mousePressPos;
QPoint mouseSelectPos;
QPoint previousMouseMovePos;
int mouseMidLastY;
bool mouseSelecting;
QRect mouseSelectionRect;
@ -2070,7 +2071,14 @@ void PageView::tabletEvent( QTabletEvent * e )
void PageView::mouseMoveEvent( QMouseEvent * e )
{
d->controlWheelAccumulatedDelta = 0;
// For some reason in Qt 5.11.2 (no idea when this started) all wheel
// events are followed by mouse move events (without changing position),
// so we only actually reset the controlWheelAccumulatedDelta if there is a mouse movement
if ( e->globalPos() != d->previousMouseMovePos )
{
d->controlWheelAccumulatedDelta = 0;
}
d->previousMouseMovePos = e->globalPos();
// don't perform any mouse action when no document is shown
if ( d->items.isEmpty() )