caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix disabling of autoconstrainter via Ctrl.

Browse Source
This commit is contained in:
whitequark 2016-06-11 22:26:36 +00:00
parent 215b8e4537
commit de6be52293
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mouse.cpp
View File

@ -888,6 +888,9 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
if(ToolbarMouseDown((int)mx, (int)my)) return; if(ToolbarMouseDown((int)mx, (int)my)) return;
} }
// This will be clobbered by MouseMoved below.
bool hasConstraintSuggestion = SS.GW.pending.hasSuggestion;
// Make sure the hover is up to date. // Make sure the hover is up to date.
MouseMoved(mx, my, /*leftDown=*/false, /*middleDown=*/false, /*rightDown=*/false, MouseMoved(mx, my, /*leftDown=*/false, /*middleDown=*/false, /*rightDown=*/false,
/*shiftDown=*/false, /*ctrlDown=*/false); /*shiftDown=*/false, /*ctrlDown=*/false);
@ -1130,7 +1133,7 @@ void GraphicsWindow::MouseLeftDown(double mx, double my) {
case Pending::DRAGGING_NEW_LINE_POINT: { case Pending::DRAGGING_NEW_LINE_POINT: {
// Constrain the line segment horizontal or vertical if close enough // Constrain the line segment horizontal or vertical if close enough
if(SS.GW.pending.hasSuggestion) { if(hasConstraintSuggestion) {
Constraint::Constrain(SS.GW.pending.suggestion, Constraint::Constrain(SS.GW.pending.suggestion,
Entity::NO_ENTITY, Entity::NO_ENTITY, pending.request.entity(0)); Entity::NO_ENTITY, Entity::NO_ENTITY, pending.request.entity(0));
} }