diff options
| author | MenTaLguY <mental@rydia.net> | 2008-07-08 03:01:39 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2008-07-08 03:01:39 +0000 |
| commit | d9af95f7409e88c603b8292f8521e0d0953efc52 (patch) | |
| tree | 45afc8e85ea8be902c1a017fe47b1a8e769ffdfc /src/display | |
| parent | disable motion hints again (diff) | |
| download | inkscape-d9af95f7409e88c603b8292f8521e0d0953efc52.tar.gz inkscape-d9af95f7409e88c603b8292f8521e0d0953efc52.zip | |
I'm an idiot who forgot that MOTION_HINT_MASK still needs MOTION_MASK
(bzr r6222)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/sp-canvas.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 5c77d4948..b780927d8 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -45,7 +45,7 @@ #include "display/inkscape-cairo.h" // GTK_CHECK_VERSION returns false on failure -#define HAS_GDK_EVENT_REQUEST_MOTIONS FALSE && GTK_CHECK_VERSION(2, 12, 0) +#define HAS_GDK_EVENT_REQUEST_MOTIONS GTK_CHECK_VERSION(2, 12, 0) // gtk_check_version returns non-NULL on failure static bool const HAS_BROKEN_MOTION_HINTS = @@ -539,9 +539,8 @@ sp_canvas_item_grab (SPCanvasItem *item, guint event_mask, GdkCursor *cursor, gu if (!(item->flags & SP_CANVAS_ITEM_VISIBLE)) return -1; - if (HAS_BROKEN_MOTION_HINTS && ( event_mask & GDK_POINTER_MOTION_HINT_MASK )) { + if (HAS_BROKEN_MOTION_HINTS) { event_mask &= ~GDK_POINTER_MOTION_HINT_MASK; - event_mask |= GDK_POINTER_MOTION_MASK; } /* fixme: Top hack (Lauris) */ @@ -1130,7 +1129,9 @@ sp_canvas_realize (GtkWidget *widget) GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - ( HAS_BROKEN_MOTION_HINTS ? GDK_POINTER_MOTION_MASK : GDK_POINTER_MOTION_HINT_MASK ) | + GDK_POINTER_MOTION_MASK | + ( HAS_BROKEN_MOTION_HINTS ? + 0 : GDK_POINTER_MOTION_HINT_MASK ) | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK | GDK_KEY_PRESS_MASK | @@ -1238,7 +1239,7 @@ emit_event (SPCanvas *canvas, GdkEvent *event) mask = GDK_LEAVE_NOTIFY_MASK; break; case GDK_MOTION_NOTIFY: - mask = GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK; + mask = GDK_POINTER_MOTION_MASK; break; case GDK_BUTTON_PRESS: case GDK_2BUTTON_PRESS: |