diff --git a/src/knot.cpp b/src/knot.cpp
index 40246ce01efc2a1accf544a7a06d8216dc445f46..dc5b78b1754c54f0fe4ff9cee1d3fcfa54f75123 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
#include "message-stack.h"
#include "message-context.h"
#include "event-context.h"
+#include "sp-namedview.h"
+#include "snap.h"
+#include "selection.h"
#define KNOT_EVENT_MASK (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | \
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | \
+ GDK_POINTER_MOTION_MASK | \
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK)
static bool nograb = false;
knot->mode = SP_KNOT_MODE_XOR;
knot->tip = NULL;
knot->_event_handler_id = 0;
+ knot->pressure = 0;
knot->fill[SP_KNOT_STATE_NORMAL] = 0xffffff00;
knot->fill[SP_KNOT_STATE_MOUSEOVER] = 0xff0000ff;
g_assert(knot != NULL);
g_assert(SP_IS_KNOT(knot));
- g_object_ref(knot);
- tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+ /* Run client universal event handler, if present */
gboolean consumed = FALSE;
- /* Run client universal event handler, if present */
-
g_signal_emit(knot, knot_signals[EVENT], 0, event, &consumed);
if (consumed) {
return TRUE;
}
+ g_object_ref(knot);
+ tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100);
+
switch (event->type) {
case GDK_2BUTTON_PRESS:
if (event->button.button == 1) {
break;
case GDK_BUTTON_RELEASE:
if (event->button.button == 1) {
+ knot->pressure = 0;
if (transform_escaped) {
transform_escaped = false;
consumed = TRUE;
// motion notify coordinates as given (no snapping back to origin)
within_tolerance = false;
+ if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &knot->pressure))
+ knot->pressure = CLAMP (knot->pressure, 0, 1);
+ else
+ knot->pressure = 0.5;
+
if (!moved) {
g_signal_emit(knot,
knot_signals[GRABBED], 0,
TRUE);
}
NR::Point const motion_w(event->motion.x, event->motion.y);
- NR::Point const motion_dt = knot->desktop->w2d(motion_w);
- NR::Point p = motion_dt - knot->grabbed_rel_pos;
- sp_knot_request_position (knot, &p, event->motion.state);
+ NR::Point motion_dt = knot->desktop->w2d(motion_w) - knot->grabbed_rel_pos;
+
+ // Only snap path nodes, for which the anchor is set to GTK_ANCHOR_CENTER
+ // (according to default value as set in sp_knot_init())
+ // If we have one of the transform handles at hand, then the anchor will be
+ // set to e.g. GTK_ANCHOR_SW (see seltrans-handles.cpp). The transform handles
+ // will be snapped in seltrans.cpp, not here
+ if (knot->anchor == GTK_ANCHOR_CENTER) {
+ SnapManager const &m = knot->desktop->namedview->snap_manager;
+ SPItem *curr = knot->desktop->selection->singleItem(); //Is this really the only way to get to the item to which this knot belongs?
+ motion_dt = m.freeSnap(Inkscape::Snapper::BBOX_POINT | Inkscape::Snapper::SNAP_POINT, motion_dt, curr).getPoint();
+ }
+
+ sp_knot_request_position (knot, &motion_dt, event->motion.state);
knot->desktop->scroll_to_point (&motion_dt);
+ knot->desktop->set_coordinate_status(knot->pos); // display the coordinate of knot, not cursor - they may be different!
moved = TRUE;
}
break;