patch 1705533

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

diff --git a/src/event-context.cpp b/src/event-context.cpp
index e2a0a4dd2a6d1dcaba8d271af99e4470668c64b5..76fe7263683df89dbb1d21efdd29d48363b912fb 100644 (file)
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -190,6 +190,7 @@ sp_event_context_update_cursor(SPEventContext *ec)
         }
         gdk_window_set_cursor(w->window, ec->cursor);
     }
+    ec->desktop->waiting_cursor = false;
 }
 
 /**
@@ -283,7 +284,7 @@ static gdouble accelerate_scroll(GdkEvent *event, gdouble acceleration, SPCanvas
 
     // reduce time interval by the time it took to paint slowest buffer, 
     // so that acceleration does not hiccup on complex slow-rendering drawings
-    if (slowest_buffer <= time_diff)
+    if ((guint32) slowest_buffer <= time_diff)
         time_diff -= slowest_buffer;
     else
         time_diff = 0;
@@ -403,10 +404,9 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
                     gobble_motion_events(panning == 2 ?
                             GDK_BUTTON2_MASK : GDK_BUTTON3_MASK);
 
-                    NR::Point const motion_w(event->motion.x,
-                                             event->motion.y);
+                    NR::Point const motion_w(event->motion.x, event->motion.y);
                     NR::Point const moved_w( motion_w - button_w );
-                    event_context->desktop->scroll_world(moved_w);
+                    event_context->desktop->scroll_world(moved_w, true); // we're still scrolling, do not redraw
                     ret = TRUE;
                 }
             } else if (zoom_rb) {
@@ -435,25 +435,39 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context,
             xp = yp = 0;
             if (within_tolerance && (panning || zoom_rb)) {
                 zoom_rb = 0;
+                if (panning) {
+                    panning = 0;
+                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                                      event->button.time);
+                }
                 NR::Point const event_w(event->button.x, event->button.y);
                 NR::Point const event_dt(desktop->w2d(event_w));
                 desktop->zoom_relative_keep_point(event_dt,
                           (event->button.state & GDK_SHIFT_MASK) ? 1/zoom_inc : zoom_inc);
                 desktop->updateNow();
-            }
-            if (panning == event->button.button) {
-                panning = 0;
                 ret = TRUE;
+            } else if (panning == event->button.button) {
+                panning = 0;
                 sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
                                       event->button.time);
+
+                // in slow complex drawings, some of the motion events are lost;
+                // to make up for this, we scroll it once again to the button-up event coordinates
+                // (i.e. canvas will always get scrolled all the way to the mouse release point, 
+                // even if few intermediate steps were visible)
+                NR::Point const motion_w(event->button.x, event->button.y);
+                NR::Point const moved_w( motion_w - button_w );
+                event_context->desktop->scroll_world(moved_w);
                 desktop->updateNow();
+                ret = TRUE;
             } else if (zoom_rb == event->button.button) {
                 zoom_rb = 0;
                 NR::Maybe<NR::Rect> const b = Inkscape::Rubberband::get()->getRectangle();
                 Inkscape::Rubberband::get()->stop();
-                if (b != NR::Nothing() && !within_tolerance) {
-                    desktop->set_display_area(b.assume(), 10);
+                if (b && !within_tolerance) {
+                    desktop->set_display_area(*b, 10);
                 }
+                ret = TRUE;
             }
             break;
         case GDK_KEY_PRESS: