Filter effects dialog:

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

diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 82eef51e7de99930be87134e91cb632044778df6..c8f9bf0f101d0b1e2cc9e3b50a79bf49b5f3dc13 100644 (file)
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -327,8 +327,13 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
 
             NR::Point const motion_w(event->motion.x,
                                      event->motion.y);
-            NR::Point const motion_dt(desktop->w2d(motion_w));
+            NR::Point motion_dt(desktop->w2d(motion_w));
+            
+            SnapManager const &m = desktop->namedview->snap_manager;
+            motion_dt = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, motion_dt, rc->item).getPoint();
+            
             sp_rect_drag(*rc, motion_dt, event->motion.state);
+            
             ret = TRUE;
         }
         break;
@@ -395,6 +400,21 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent
         case GDK_Escape:
             sp_desktop_selection(desktop)->clear();
             //TODO: make dragging escapable by Esc
+            break;
+
+        case GDK_space:
+            if (dragging) {
+                sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                                      event->button.time);
+                dragging = false;
+                if (!event_context->within_tolerance) {
+                    // we've been dragging, finish the rect
+                    sp_rect_finish(rc);
+                }
+                // do not return true, so that space would work switching to selector
+            }
+            break;
+
         default:
             break;
         }