Super duper mega (fun!) commit: replaced encoding=utf-8 with fileencoding=utf-8 in...

[inkscape.git] / src / desktop-events.cpp

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 810f501d7fe1bbf024161db08f6fa31b54d9e314..f7697a6c06d4ebe93dc7ffa5ae5897986c876566 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -150,6 +150,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
                     // Because the guide snapper only looks in the document for guides to snap to,
                     // we don't have to worry about a guide snapping to itself here
                     m.guideFreeSnap(event_dt, normal, SP_DRAG_MOVE_ORIGIN);
+                    m.unSetup();
                 }
 
                 sp_guideline_set_position(SP_GUIDELINE(guide), from_2geom(event_dt));
@@ -172,6 +173,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
                     // Because the guide snapper only looks in the document for guides to snap to,
                     // we don't have to worry about a guide snapping to itself here
                     m.guideFreeSnap(event_dt, normal, SP_DRAG_MOVE_ORIGIN);
+                    m.unSetup();
                 }
 
                 dragging = false;
@@ -296,11 +298,11 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                     if (!(event->motion.state & GDK_SHIFT_MASK)) {
                         m.guideConstrainedSnap(motion_dt, *guide);
                     }
-                } else if (!(event->motion.state & GDK_SHIFT_MASK)) {
-                    if (!((drag_type == SP_DRAG_ROTATE) && (event->motion.state & GDK_CONTROL_MASK))) {
-                        m.guideFreeSnap(motion_dt, guide->normal_to_line, drag_type);
-                    }
+                } else if (!((drag_type == SP_DRAG_ROTATE) && (event->motion.state & GDK_CONTROL_MASK))) {
+                    // cannot use shift here to disable snapping, because we already use it for rotating the guide
+                    m.guideFreeSnap(motion_dt, guide->normal_to_line, drag_type);
                 }
+                m.unSetup();
 
                 switch (drag_type) {
                     case SP_DRAG_TRANSLATE:
@@ -361,11 +363,11 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
                         if (!(event->button.state & GDK_SHIFT_MASK)) {
                             m.guideConstrainedSnap(event_dt, *guide);
                         }
-                    } else if (!(event->button.state & GDK_SHIFT_MASK)) {
-                        if (!((drag_type == SP_DRAG_ROTATE) && (event->motion.state & GDK_CONTROL_MASK))) {
-                            m.guideFreeSnap(event_dt, guide->normal_to_line, drag_type);
-                        }
+                    } else if (!((drag_type == SP_DRAG_ROTATE) && (event->motion.state & GDK_CONTROL_MASK))) {
+                        // cannot use shift here to disable snapping, because we already use it for rotating the guide
+                        m.guideFreeSnap(event_dt, guide->normal_to_line, drag_type);
                     }
+                    m.unSetup();
 
                     if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) {
                         switch (drag_type) {
@@ -619,5 +621,5 @@ void snoop_extended(GdkEvent* event, SPDesktop *desktop)
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :