diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 00:35:09 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-07-01 00:35:09 +0000 |
| commit | ff04a08000adfa762ad1f4bc4f4df64c11ed499c (patch) | |
| tree | 9e6f4bcf3c8f87fcecdc8d11dd2eb0ec2d37c0c9 /src/knot.cpp | |
| parent | Merge branch 'master' of https://gitlab.com/jabiertxof/inkscape into selectab... (diff) | |
| download | inkscape-ff04a08000adfa762ad1f4bc4f4df64c11ed499c.tar.gz inkscape-ff04a08000adfa762ad1f4bc4f4df64c11ed499c.zip | |
working on knots selection
Diffstat (limited to 'src/knot.cpp')
| -rw-r--r-- | src/knot.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/knot.cpp b/src/knot.cpp index 2ae1e2cd9..e44efde4f 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -182,7 +182,6 @@ void SPKnot::startDragging(Geom::Point const &p, gint x, gint y, guint32 etime) } void SPKnot::selectKnot(bool select){ - selected = select; setFlag(SP_KNOT_SELECTED, select); } @@ -224,7 +223,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot knot->startDragging(p, (gint) event->button.x, (gint) event->button.y, event->button.time); knot->mousedown_signal.emit(knot, event->button.state); consumed = TRUE; - knot->selectKnot(!knot->selected); + knot->selectKnot(!(knot->flags & SP_KNOT_SELECTED)); } break; case GDK_BUTTON_RELEASE: @@ -234,9 +233,6 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot sp_event_context_snap_watchdog_callback(knot->desktop->event_context->_delayed_snap_event); } sp_event_context_discard_delayed_snap_event(knot->desktop->event_context); - if(knot->flags & SP_KNOT_MOUSEOVER){ - knot->selectKnot(!knot->selected); - } knot->pressure = 0; if (transform_escaped) { @@ -469,7 +465,7 @@ void SPKnot::_setCtrlState() { state = SP_KNOT_STATE_DRAGGING; } else if (this->flags & SP_KNOT_MOUSEOVER) { state = SP_KNOT_STATE_MOUSEOVER; - } else if (this->flags & SP_KNOT_STATE_SELECTED) { + } else if (this->flags & SP_KNOT_SELECTED) { state = SP_KNOT_STATE_SELECTED; } g_object_set(this->item, "fill_color", this->fill[state], NULL); |
