diff view/Pane.cpp @ 921:4968bbaf1ed8 tonioni

Merge from default branch

--- a/view/Pane.cpp	Tue Nov 11 17:05:44 2014 +0000
+++ b/view/Pane.cpp	Mon Mar 23 10:04:51 2015 +0000
@@ -2024,6 +2024,11 @@
 
     int smallThreshold = 10, bigThreshold = 80;
 
+    if (m_manager) {
+        smallThreshold = m_manager->scalePixelSize(smallThreshold);
+        bigThreshold = m_manager->scalePixelSize(bigThreshold);
+    }
+
 //    SVDEBUG << "Pane::updateDragMode: xdiff = " << xdiff << ", ydiff = "
 //              << ydiff << ", canMoveVertical = " << canMoveVertical << ", drag mode = " << m_dragMode << endl;
 
@@ -2288,7 +2293,7 @@
 
         // Sometimes on Linux we're seeing absurdly extreme angles on
         // the first wheel event -- discard those entirely
-        if (abs(m_pendingWheelAngle) >= 600) {
+        if (abs(m_pendingWheelAngle) > 1000) {
             m_pendingWheelAngle = 0;
             return;
         }