# HG changeset patch
# User Rik <rik@octave.org>
# Date 1428456541 25200
# Node ID 055ad6fbc910fcd3adcc502756f48cc6677ac004
# Parent  3538c2824dd88e5a41ac1b8448d886530bcc031f
Don't zoom in for 'Z-' setting and rectangle drag (bug #44437).

* Canvas.cc (canvasMouseReleaseEvent): Check m_mouseMode is ZoomInMode
before zooming.

diff -r 3538c2824dd8 -r 055ad6fbc910 libgui/graphics/Canvas.cc
--- a/libgui/graphics/Canvas.cc	Tue Apr 07 16:55:39 2015 -0400
+++ b/libgui/graphics/Canvas.cc	Tue Apr 07 18:29:01 2015 -0700
@@ -414,7 +414,7 @@
 void
 Canvas::canvasMouseDoubleClickEvent (QMouseEvent* event)
 {
-  // same processing as nornal click, but event type is MouseButtonDblClick
+  // same processing as normal click, but event type is MouseButtonDblClick
   canvasMousePressEvent (event);
 }
 
@@ -571,8 +571,7 @@
                 {
                   if (event->button () == Qt::LeftButton)
                     {
-                      axes::properties& ap =
-                        Utils::properties<axes> (axesObj);
+                      axes::properties& ap = Utils::properties<axes> (axesObj);
 
                       autoscale_axes (ap);
                     }
@@ -662,7 +661,7 @@
 
               ap.zoom_about_point (zm, p1(0), p1(1), factor);
             }
-          else
+          else if (m_mouseMode == ZoomInMode)
             {
               ColumnVector p0 = ap.pixel2coord (m_mouseAnchor.x (),
                                                 m_mouseAnchor.y ());