Fix ef spam when adjusting pattern on text - patch from Adonis Papaderos

[inkscape.git] / src / dropper-context.cpp

diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp
index 5c66eca46fa520821c7164dfb6b3215ca8ebfb20..5415fdc80fb050af4193d3c11cab77911811b5b9 100644 (file)
--- 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));
@@ -140,9 +145,11 @@ static void sp_dropper_context_finish(SPEventContext *ec)
 /**
  * Returns the current dropper context icc-color.
  */
-SPColor* sp_dropper_context_get_icc_color(SPEventContext *ec)
+SPColor* sp_dropper_context_get_icc_color(SPEventContext */*ec*/)
 {
     //TODO: implement-me!
+
+    return 0; // At least we will cause a clean crash, instead of random corruption.
 }
 
 /**
@@ -179,6 +186,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 +332,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;