diff options
| author | Ted Gould <ted@gould.cx> | 2009-11-29 19:51:36 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-11-29 19:51:36 +0000 |
| commit | 51a880db854a5959378d755b3049a168f634c071 (patch) | |
| tree | ac1d51963375f9cbb14a730153447b01e981b620 /src/dropper-context.cpp | |
| parent | adding iffdefs for LCMS and fixing layout of CMS icons (diff) | |
| parent | Deprecation warning fix on xcf export (diff) | |
| download | inkscape-51a880db854a5959378d755b3049a168f634c071.tar.gz inkscape-51a880db854a5959378d755b3049a168f634c071.zip | |
Updating to current trunk
(bzr r8050.1.16)
Diffstat (limited to 'src/dropper-context.cpp')
| -rw-r--r-- | src/dropper-context.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index 5c66eca46..95adbce0e 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -129,6 +129,11 @@ static void sp_dropper_context_finish(SPEventContext *ec) SPDropperContext *dc = SP_DROPPER_CONTEXT(ec); ec->enableGrDrag(false); + + if (dc->grabbed) { + sp_canvas_item_ungrab(dc->grabbed, GDK_CURRENT_TIME); + dc->grabbed = NULL; + } if (dc->area) { gtk_object_destroy(GTK_OBJECT(dc->area)); @@ -179,6 +184,12 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv dc->dragging = TRUE; ret = TRUE; } + + 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_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) { @@ -319,6 +330,11 @@ static gint sp_dropper_context_root_handler(SPEventContext *event_context, GdkEv { sp_canvas_item_hide(dc->area); dc->dragging = FALSE; + + if (dc->grabbed) { + sp_canvas_item_ungrab(dc->grabbed, event->button.time); + dc->grabbed = NULL; + } double alpha_to_set = setalpha? dc->alpha : 1.0; |