NR::Maybe => boost::optional

[inkscape.git] / src / zoom-context.cpp

diff --git a/src/zoom-context.cpp b/src/zoom-context.cpp
index 62395581f400003b269957e8da74589f68b4431e..56eeb69cb9e93aa0644e601826a307111023e37e 100644 (file)
--- a/src/zoom-context.cpp
+++ b/src/zoom-context.cpp
@@ -124,24 +124,32 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
 
     switch (event->type) {
         case GDK_BUTTON_PRESS:
-            if (event->button.button == 1) {
+        {
+            NR::Point const button_w(event->button.x, event->button.y);
+            NR::Point const button_dt(desktop->w2d(button_w));
+            if (event->button.button == 1 && !event_context->space_panning) {
                 // save drag origin
                 xp = (gint) event->button.x;
                 yp = (gint) event->button.y;
                 within_tolerance = true;
 
-                NR::Point const button_w(event->button.x, event->button.y);
-                NR::Point const button_dt(desktop->w2d(button_w));
                 Inkscape::Rubberband::get()->start(desktop, button_dt);
 
                 escaped = false;
 
+                ret = TRUE;
+            } else if (event->button.button == 3) {
+                double const zoom_rel( (event->button.state & GDK_SHIFT_MASK)
+                                       ? zoom_inc
+                                       : 1 / zoom_inc );
+                desktop->zoom_relative_keep_point(button_dt, zoom_rel);
                 ret = TRUE;
             }
             break;
+        }
 
        case GDK_MOTION_NOTIFY:
-            if (event->motion.state & GDK_BUTTON1_MASK) {
+            if (event->motion.state & GDK_BUTTON1_MASK && !event_context->space_panning) {
                 ret = TRUE;
 
                 if ( within_tolerance
@@ -157,29 +165,31 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
                 NR::Point const motion_w(event->motion.x, event->motion.y);
                 NR::Point const motion_dt(desktop->w2d(motion_w));
                 Inkscape::Rubberband::get()->move(motion_dt);
+                gobble_motion_events(GDK_BUTTON1_MASK);
             }
             break;
 
-       case GDK_BUTTON_RELEASE:
-            if ( event->button.button == 1 ) {
-                NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
-                if (b != NR::Nothing() && !within_tolerance) {
-                    desktop->set_display_area(b.assume(), 10);
+       case GDK_BUTTON_RELEASE:
+        {
+            NR::Point const button_w(event->button.x, event->button.y);
+            NR::Point const button_dt(desktop->w2d(button_w));
+            if ( event->button.button == 1  && !event_context->space_panning) {
+                boost::optional<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
+                if (b && !within_tolerance) {
+                    desktop->set_display_area(*b, 10);
                 } else if (!escaped) {
-                    NR::Point const button_w(event->button.x, event->button.y);
-                    NR::Point const button_dt(desktop->w2d(button_w));
                     double const zoom_rel( (event->button.state & GDK_SHIFT_MASK)
                                            ? 1 / zoom_inc
                                            : zoom_inc );
                     desktop->zoom_relative_keep_point(button_dt, zoom_rel);
                 }
                 ret = TRUE;
-            }
+            } 
             Inkscape::Rubberband::get()->stop();
             xp = yp = 0;
             escaped = false;
             break;
-
+        }
         case GDK_KEY_PRESS:
             switch (get_group0_keyval (&event->key)) {
                 case GDK_Escape: