From 0fb506bc7d99dd53cfbfde12c66ef003b4e8a1b6 Mon Sep 17 00:00:00 2001 From: John Smith Date: Thu, 2 Aug 2012 15:57:12 +0900 Subject: Fix for 685689 : Panning with Shift+RMB fails when dropper tool selected (bzr r11583) --- src/dropper-context.cpp | 6 +++--- 1 file 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) { -- cgit v1.2.3