From b2e46b1363564aa72394ee2feb6a5a6cb49194a5 Mon Sep 17 00:00:00 2001 From: mental Date: Tue, 8 Jul 2008 02:32:42 +0000 Subject: [PATCH] enable motion hints for non-freehand actions --- src/arc-context.cpp | 2 +- src/box3d-context.cpp | 2 +- src/desktop-events.cpp | 2 +- src/event-context.cpp | 6 +++--- src/knot.cpp | 2 +- src/rect-context.cpp | 2 +- src/select-context.cpp | 4 ++-- src/spiral-context.cpp | 2 +- src/star-context.cpp | 2 +- src/text-context.cpp | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/arc-context.cpp b/src/arc-context.cpp index b8f7e30e6..0be96353e 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -270,7 +270,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK, + GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, NULL, event->button.time); ret = TRUE; } diff --git a/src/box3d-context.cpp b/src/box3d-context.cpp index e5acaba1f..75441edb1 100644 --- a/src/box3d-context.cpp +++ b/src/box3d-context.cpp @@ -338,7 +338,7 @@ static gint sp_box3d_context_root_handler(SPEventContext *event_context, GdkEven sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), ( GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK ), NULL, event->button.time); ret = TRUE; diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index e151f0ac9..32cb341ac 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -226,7 +226,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) sp_canvas_item_grab(item, ( GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | - GDK_POINTER_MOTION_MASK ), + GDK_POINTER_MOTION_HINT_MASK ), NULL, event->button.time); ret = TRUE; diff --git a/src/event-context.cpp b/src/event-context.cpp index 017c06c16..6a3071d43 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -374,7 +374,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, if (event_context->space_panning) { panning = 1; sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, + GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK, NULL, event->button.time-1); ret = TRUE; } @@ -385,7 +385,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, } else { panning = 2; sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, + GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK, NULL, event->button.time-1); } ret = TRUE; @@ -395,7 +395,7 @@ static gint sp_event_context_private_root_handler(SPEventContext *event_context, || event->button.state & GDK_CONTROL_MASK) { panning = 3; sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK, + GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK, NULL, event->button.time); ret = TRUE; } else { diff --git a/src/knot.cpp b/src/knot.cpp index 2348f4aea..7d220ef76 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -31,7 +31,7 @@ #define KNOT_EVENT_MASK (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | \ - GDK_POINTER_MOTION_MASK | \ + GDK_POINTER_MOTION_HINT_MASK | \ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) static bool nograb = false; diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 18904f931..7759452e0 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -312,7 +312,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), ( GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK ), NULL, event->button.time); diff --git a/src/select-context.cpp b/src/select-context.cpp index 76bdb4938..b4a069f72 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -341,7 +341,7 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE } sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->drawing), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | - GDK_POINTER_MOTION_MASK, + GDK_POINTER_MOTION_HINT_MASK, NULL, event->button.time); sc->grabbed = SP_CANVAS_ITEM(desktop->drawing); @@ -448,7 +448,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) sc->grabbed = NULL; } sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK, + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, NULL, event->button.time); sc->grabbed = SP_CANVAS_ITEM(desktop->acetate); diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp index 56c5b0ebd..02a75812f 100644 --- a/src/spiral-context.cpp +++ b/src/spiral-context.cpp @@ -272,7 +272,7 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event) sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), ( GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK ), NULL, event->button.time); ret = TRUE; diff --git a/src/star-context.cpp b/src/star-context.cpp index c5fa5a0b9..4a13a98ed 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -287,7 +287,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK, + GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK, NULL, event->button.time); ret = TRUE; } diff --git a/src/text-context.cpp b/src/text-context.cpp index 4b25deb93..d0fb06760 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -616,7 +616,7 @@ sp_text_context_root_handler(SPEventContext *const event_context, GdkEvent *cons Inkscape::Rubberband::get()->start(desktop, tc->p0); sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate), GDK_KEY_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | - GDK_POINTER_MOTION_MASK, + GDK_POINTER_MOTION_HINT_MASK, NULL, event->button.time); tc->grabbed = SP_CANVAS_ITEM(desktop->acetate); tc->creating = 1; -- 2.30.2