[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/okular/ui
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2010-08-30 18:24:12
Message-ID: 20100830182412.0C624AC86C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1170085 by aacid:

forwardport r1170081 okular/branches/KDE/4.5/kdegraphics/okular/ui/pageview.cpp: 
Do not crash if we are in dummy mode and the user tries to "select an area"


 M  +2 -2      pageview.cpp  


--- trunk/KDE/kdegraphics/okular/ui/pageview.cpp #1170084:1170085
@@ -1555,7 +1555,7 @@
                     verticalScrollBar()->setValue(verticalScrollBar()->value() + delta.y());
                 }
             }
-            else if ( rightButton && !d->mousePressPos.isNull() )
+            else if ( rightButton && !d->mousePressPos.isNull() && d->aMouseSelect )
             {
                 // if mouse moves 5 px away from the press point, switch to 'selection'
                 int deltaX = d->mousePressPos.x() - e->globalPos().x(),
@@ -3258,7 +3258,7 @@
         verticalScrollBar()->setEnabled( true );
         horizontalScrollBar()->setEnabled( true );
         return;
-    }
+    }
 
     // move the viewport smoothly (kmplot: p(x)=1+0.47*(x-1)^3-0.25*(x-1)^4)
     float convergeSpeed = (float)diffTime / 667.0,
[prev in list] [next in list] [prev in thread] [next in thread]