Commit 47f95bef authored by Nathan Lee's avatar Nathan Lee Committed by Thomas Holder

Sync pen toolbar mode change with tool

Reverts a previous fix that did this but caused
#282
where the pen tool's green preview line vanished
when deleting the last node with the pen tool.
parent 6f0eadeb
Pipeline #66636047 failed with stages
in 115 minutes and 37 seconds
......@@ -252,6 +252,9 @@ PencilToolbar::mode_changed(int mode)
if (_simplify) {
_simplify->set_visible(visible);
}
if (tools_isactive(_desktop, TOOLS_FREEHAND_PEN)) {
SP_PEN_CONTEXT(_desktop->event_context)->setPolylineMode();
}
}
/* This is used in generic functions below to share large portions of code between pen and pencil tool */
......
......@@ -429,7 +429,7 @@ bool PenTool::_handleButtonPress(GdkEventButton const &bevent) {
// This is allowed, if we just canceled curve
case PenTool::POINT:
if (this->npoints == 0) {
this->setPolylineMode();
this->_bsplineSpiroColor();
Geom::Point p;
if ((bevent.state & GDK_CONTROL_MASK) && (this->polylines_only || this->polylines_paraxial)) {
p = event_dt;
......@@ -508,7 +508,6 @@ bool PenTool::_handleButtonPress(GdkEventButton const &bevent) {
this->_setSubsequentPoint(p, true);
}
}
this->_bsplineSpiroColor();
// avoid the creation of a control point so a node is created in the release event
this->state = (this->spiro || this->bspline || this->polylines_only) ? PenTool::POINT : PenTool::CONTROL;
ret = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment