Mercurial > octave

changeset 24372:708b98b4cdd1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make wheel scroll behave more consistently in pan mode (bug #52588). * Canvas.cc (Canvas::canvasWheelEvent): Wheel scroll moves vertically by default and horizontally with shift modifier key.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Wed, 06 Dec 2017 13:45:54 +0100
parents ccedd8a29d3e
children 798b56f0b207 80948d6e58c2
files libgui/graphics/Canvas.cc
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/Canvas.cc	Wed Dec 06 12:39:27 2017 -0600
+++ b/libgui/graphics/Canvas.cc	Wed Dec 06 13:45:54 2017 +0100
@@ -985,7 +985,12 @@
 
                   double factor = event->delta () > 0 ? 0.1 : -0.1;
 
-                  ap.pan (mode, factor);
+                  if (event->modifiers () == Qt::NoModifier 
+                      && mode != "horizontal")
+                    ap.pan ("vertical", factor);
+                  else if (event->modifiers () == Qt::ShiftModifier 
+                      && mode != "vertical")
+                    ap.pan ("horizontal", factor);
                 }
                 break;