diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2010-11-25 20:51:17 +0000 |
| commit | 0bd9f7e209d522dbcebe0449a91397fdd9e38977 (patch) | |
| tree | 834c7d02456658b57625ab68cc28f7854a5a85dc /src/desktop-events.cpp | |
| parent | Fix handling of x and y attributes of patterns (diff) | |
| parent | Fix ruler redraw issue on GTK 2.22 (diff) | |
| download | inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.tar.gz inkscape-0bd9f7e209d522dbcebe0449a91397fdd9e38977.zip | |
Merge from trunk
(bzr r9508.1.70)
Diffstat (limited to 'src/desktop-events.cpp')
| -rw-r--r-- | src/desktop-events.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index bb22b0faa..f7697a6c0 100644 --- 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; @@ -297,9 +299,10 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) m.guideConstrainedSnap(motion_dt, *guide); } } 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); + // 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,9 +364,10 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) m.guideConstrainedSnap(event_dt, *guide); } } 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); + // 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) { @@ -617,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 : |