[patch] okular-4.14.3-02-fix-mid-mouse-click-on-scrollbar.patch

okular-4.14.3-02-fix-mid-mouse-click-on-scrollbar.patch (text/plain), 1.57 KB, created by Andreas Sturmlechner on 2015-01-02 23:54:36 UTC

commit 67807b73b84d721d051aa4962720dfcf08cbc250
Author: Albert Astals Cid <[e-mail]>
Date:   Fri Dec 12 00:48:41 2014 +0100

    Fix mid mouse button click on the scrollbar
    
    On 45dc1990 i made the wrong assumption that if you were in
    slotRequestVisiblePixmaps with the mid mouse button pressed
    it meant that you were mid mouse button zooming, but this is not
    true if you mid mouse click on the scrollbar.
    
    So the solution to ignore pixmap request on mid mouse button zooming
    is actually use blockPixmapsRequest
    
    BUGS: 341583
    FIXED-IN: 14.12.1

diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 03dbe89..9fe128e 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -1893,7 +1893,9 @@ void PageView::mouseMoveEvent( QMouseEvent * e )
         if ( deltaY )
         {
             d->zoomFactor *= ( 1.0 + ( (double)deltaY / 500.0 ) );
+            d->blockPixmapsRequest = true;
             updateZoom( ZoomRefreshCurrent );
+            d->blockPixmapsRequest = false;
             viewport()->repaint();
         }
         return;
@@ -4314,8 +4316,7 @@ static void slotRequestPreloadPixmap( Okular::DocumentObserver * observer, const
 void PageView::slotRequestVisiblePixmaps( int newValue )
 {
     // if requests are blocked (because raised by an unwanted event), exit
-    if ( d->blockPixmapsRequest || d->viewportMoveActive ||
-         ( QApplication::mouseButtons () & Qt::MidButton ) )
+    if ( d->blockPixmapsRequest || d->viewportMoveActive )
         return;
 
     // precalc view limits for intersecting with page coords inside the loop