diff options
| author | Diederik van Lierop <mailat-signdiedenrezidotnl> | 2010-07-18 10:12:38 +0000 |
|---|---|---|
| committer | Diederik van Lierop <mailat-signdiedenrezidotnl> | 2010-07-18 10:12:38 +0000 |
| commit | 03e65527a5994b916056f263e96d9bc19acff878 (patch) | |
| tree | 80fe353aeb22a1b708f0573d8638130e3c79fb23 /src/desktop-events.cpp | |
| parent | Turn off color profile debug messages. (diff) | |
| download | inkscape-03e65527a5994b916056f263e96d9bc19acff878.tar.gz inkscape-03e65527a5994b916056f263e96d9bc19acff878.zip | |
- do not use shift to disable snapping while holding shift to rotate a guide
- snap guides to paths too
- always show the same snap indicator
(bzr r9625)
Diffstat (limited to 'src/desktop-events.cpp')
| -rw-r--r-- | src/desktop-events.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 810f501d7..bb22b0faa 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -296,10 +296,9 @@ 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); } switch (drag_type) { @@ -361,10 +360,9 @@ 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); } if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) { |