Mercurial > octave

changeset 24373:798b56f0b207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Wed, 06 Dec 2017 17:07:11 -0800
parents c9d229f1db04 (current diff) 708b98b4cdd1 (diff)
children 2e5259153857
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 16:51:19 2017 -0800
+++ b/libgui/graphics/Canvas.cc	Wed Dec 06 17:07:11 2017 -0800
@@ -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;