diff --git a/src/knot.cpp b/src/knot.cpp
index 01b1bafa2b844252e677d5f08ab53de5eb83a5a1..3ec2799bd63a11ce26a8ea00567faca3b735af80 100644 (file)
--- a/src/knot.cpp
+++ b/src/knot.cpp
static void sp_knot_dispose(GObject *object);
static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot);
static void sp_knot_dispose(GObject *object);
static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot);
-static void sp_knot_set_flag(SPKnot *knot, guint flag, bool set);
static void sp_knot_set_ctrl_state(SPKnot *knot);
static GObjectClass *parent_class;
static void sp_knot_set_ctrl_state(SPKnot *knot);
static GObjectClass *parent_class;
knot->mode = SP_KNOT_MODE_XOR;
knot->tip = NULL;
knot->_event_handler_id = 0;
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;
knot->fill[SP_KNOT_STATE_NORMAL] = 0xffffff00;
knot->fill[SP_KNOT_STATE_MOUSEOVER] = 0xff0000ff;
break;
case GDK_BUTTON_RELEASE:
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;
if (transform_escaped) {
transform_escaped = false;
consumed = TRUE;
// motion notify coordinates as given (no snapping back to origin)
within_tolerance = false;
// 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,
if (!moved) {
g_signal_emit(knot,
knot_signals[GRABBED], 0,
g_signal_emit(knot,
knot_signals[UNGRABBED], 0,
event->button.state);
g_signal_emit(knot,
knot_signals[UNGRABBED], 0,
event->button.state);
- sp_document_undo(SP_DT_DOCUMENT(knot->desktop));
+ sp_document_undo(sp_desktop_document(knot->desktop));
knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
transform_escaped = true;
consumed = TRUE;
knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
transform_escaped = true;
consumed = TRUE;
knot->tip = g_strdup (tip);
}
knot->tip = g_strdup (tip);
}
- knot->item = sp_canvas_item_new(SP_DT_CONTROLS (desktop),
+ knot->item = sp_canvas_item_new(sp_desktop_controls (desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"size", 8.0,
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"size", 8.0,
/**
* Set flag in knot, with side effects.
*/
/**
* Set flag in knot, with side effects.
*/
-static void sp_knot_set_flag(SPKnot *knot, guint flag, bool set)
+void sp_knot_set_flag(SPKnot *knot, guint flag, bool set)
{
g_assert(knot != NULL);
g_assert(SP_IS_KNOT(knot));
{
g_assert(knot != NULL);
g_assert(SP_IS_KNOT(knot));