![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index d8fb9d8d5155bfaae2ece3f5da575dd7a980f88d..cea478f85847c35d149ef913d8e6d63b32b26856 100644 (file)
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
static bool dragging = false;
static SPCanvasItem *guide = NULL;
static Geom::Point normal;
- static bool snap_window_temporarily_open = false;
int wx, wy;
SPDesktop *desktop = dtw->desktop;
if (event->button.button == 1) {
dragging = true;
- // FIXME: The snap delay mechanism won't work here, because it has been implemented
- // for the event context. Dragging guides off the ruler will send event to the ruler
- // and not to the context, which bypasses sp_event_context_snap_delay_handler
- // The snap manager will not notice the difference, so it'll check if the snap delay
- // has been activated (This check is only needed for catching coding errors, i.e.
- // to warn if the snap window has not been implemented properly in some context)
- if (desktop->event_context->_snap_window_open == false) {
- // A dt_ruler_event might be emitted when dragging a guide off the rulers
- // while drawing a Bezier curve. In such a situation, we're already in that
- // specific context and the snap delay is already active. We should not set
- // the snap delay to active again, because that will trigger a similar warning
- // to the one above
- sp_event_context_snap_window_open(desktop->event_context);
- snap_window_temporarily_open = true;
- }
+ // FIXME: The snap delay mechanism won't work here, because it has been implemented for the event context. Dragging
+ // guides off the ruler will send event to the ruler and not to the context, which bypasses sp_event_context_snap_delay_handler
Geom::Point const event_w(sp_canvas_window_to_world(dtw->canvas, event_win));
Geom::Point const event_dt(desktop->w2d(event_w));
@@ -164,7 +150,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
// We only have a temporary guide which is not stored in our document yet.
// 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);
+ m.guideFreeSnap(event_dt, normal, SP_DRAG_MOVE_ORIGIN);
sp_guideline_set_position(SP_GUIDELINE(guide), from_2geom(event_dt));
desktop->set_coordinate_status(to_2geom(event_dt));
@@ -182,15 +168,11 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
// We only have a temporary guide which is not stored in our document yet.
// 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);
+ m.guideFreeSnap(event_dt, normal, SP_DRAG_MOVE_ORIGIN);
dragging = false;
- // See the comments in GDK_BUTTON_PRESS
- if (snap_window_temporarily_open) {
- sp_event_context_snap_window_closed(desktop->event_context);
- snap_window_temporarily_open = false;
- }
+ sp_event_context_discard_delayed_snap_event(desktop->event_context);
gtk_object_destroy(GTK_OBJECT(guide));
guide = NULL;
@@ -209,7 +191,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge
// A dt_ruler_event might be emitted when dragging a guide of the rulers
// while drawing a Bezier curve. In such a situation, we're already in that
// specific context and the snap delay is already active. We should interfere
- // with that context and we should therefore leave the snap delay status
+ // with that context and we should therefore leave the snap delay status
// as it is. So although it might have been set to active above on
// GDK_BUTTON_PRESS, we should not set it back to inactive here. That must be
// done by the context.
@@ -231,22 +213,13 @@ int sp_dt_vruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw)
return sp_dt_ruler_event(widget, event, dtw, false);
}
-/* Guides */
-enum SPGuideDragType {
- SP_DRAG_TRANSLATE,
- SP_DRAG_TRANSLATE_CONSTRAINED, // Is not being used currently!
- SP_DRAG_ROTATE,
- SP_DRAG_MOVE_ORIGIN,
- SP_DRAG_NONE
-};
-
static Geom::Point drag_origin;
static SPGuideDragType drag_type = SP_DRAG_NONE;
//static bool reset_drag_origin = false; // when Ctrl is pressed while dragging, this is used to trigger resetting of the
// // drag origin to that location so that constrained movement is more intuitive
// Min distance from anchor to initiate rotation, measured in screenpixels
-#define tol 40.0
+#define tol 40.0
gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data)
{
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
drag_type = SP_DRAG_NONE;
- sp_event_context_snap_window_closed(desktop->event_context);
+ sp_event_context_discard_delayed_snap_event(desktop->event_context);
sp_canvas_item_ungrab(item, event->button.time);
Inkscape::UI::Dialogs::GuidelinePropertiesDialog::showDialog(guide, desktop);
ret = TRUE;
break;
case GDK_BUTTON_PRESS:
if (event->button.button == 1) {
- sp_event_context_snap_window_open(desktop->event_context);
Geom::Point const event_w(event->button.x, event->button.y);
Geom::Point const event_dt(desktop->w2d(event_w));
motion_dt = line.pointAt(t);
m.guideConstrainedSnap(motion_dt, *guide);
} else {
- m.guideFreeSnap(motion_dt, guide->normal_to_line);
+ m.guideFreeSnap(motion_dt, guide->normal_to_line, drag_type);
}
switch (drag_type) {
sp_guide_moveto(*guide, motion_dt, false);
break;
}
- case SP_DRAG_TRANSLATE_CONSTRAINED: // Is not being used currently!
- {
- Geom::Point pt_constr = Geom::constrain_angle(guide->point_on_line, motion_dt);
- sp_guide_moveto(*guide, pt_constr, false);
- break;
- }
case SP_DRAG_ROTATE:
{
Geom::Point pt = motion_dt - guide->point_on_line;
event_dt = line.pointAt(t);
m.guideConstrainedSnap(event_dt, *guide);
} else {
- m.guideFreeSnap(event_dt, guide->normal_to_line);
+ m.guideFreeSnap(event_dt, guide->normal_to_line, drag_type);
}
if (sp_canvas_world_pt_inside_window(item->canvas, event_w)) {
sp_guide_moveto(*guide, event_dt, true);
break;
}
- case SP_DRAG_TRANSLATE_CONSTRAINED: // Is not being used currently!
- {
- Geom::Point pt_constr = Geom::constrain_angle(guide->point_on_line, event_dt);
- sp_guide_moveto(*guide, pt_constr, true);
- break;
- }
case SP_DRAG_ROTATE:
{
Geom::Point pt = event_dt - guide->point_on_line;
desktop->setPosition (from_2geom(event_dt));
}
drag_type = SP_DRAG_NONE;
- sp_event_context_snap_window_closed(desktop->event_context);
+ sp_event_context_discard_delayed_snap_event(desktop->event_context);
sp_canvas_item_ungrab(item, event->button.time);
ret=TRUE;
}