diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-08-02 06:57:12 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-08-02 06:57:12 +0000 |
| commit | 0fb506bc7d99dd53cfbfde12c66ef003b4e8a1b6 (patch) | |
| tree | d1fd7b15d60db1d1a5d2d678f7dedebe5dd398a7 | |
| parent | Filters. Fix for Bug #582552 (Make object -> Apply certain filters -> Open fi... (diff) | |
| download | inkscape-0fb506bc7d99dd53cfbfde12c66ef003b4e8a1b6.tar.gz inkscape-0fb506bc7d99dd53cfbfde12c66ef003b4e8a1b6.zip | |
Fix for 685689 : Panning with Shift+RMB fails when dropper tool selected
(bzr r11583)
| -rw-r--r-- | src/dropper-context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index b38443692..ecbcc965b 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -194,11 +194,11 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, NULL, event->button.time); dc->grabbed = SP_CANVAS_ITEM(desktop->acetate); - + break; case GDK_MOTION_NOTIFY: - if (event->motion.state & GDK_BUTTON2_MASK) { - // pass on middle-drag + if (event->motion.state & GDK_BUTTON2_MASK || event->motion.state & GDK_BUTTON3_MASK) { + // pass on middle and right drag ret = FALSE; break; } else if (!event_context->space_panning) { |