matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove bad wind tool exception, make sure UpdateDrawMode() is called on zoom mouseups

Browse Source 
should be pretty easy to remove any remaining tptmp syncing issues now. There are still a few possible bugs in my list but they require a mouse to test ...
This commit is contained in:
jacob1 2015-09-24 02:14:56 -04:00
parent 5acf366d70
commit 610cd82f0d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/game/GameView.cpp
View File

@ -1217,14 +1217,14 @@ void GameView::OnMouseUp(int x, int y, unsigned button)
// plop tool stuff (like STKM) // plop tool stuff (like STKM)
c->ToolClick(toolIndex, finalDrawPoint2); c->ToolClick(toolIndex, finalDrawPoint2);
} }
// update the drawing mode for the next line
// since ctrl/shift state may have changed since we started drawing
UpdateDrawMode();
} }
// this shouldn't happen, but do this just in case // this shouldn't happen, but do this just in case
else if (selectMode != SelectNone && button != BUTTON_LEFT) else if (selectMode != SelectNone && button != BUTTON_LEFT)
selectMode = SelectNone; selectMode = SelectNone;
// update the drawing mode for the next line
// since ctrl/shift state may have changed since we started drawing
UpdateDrawMode();
} }
void GameView::ExitPrompt() void GameView::ExitPrompt()
@ -1367,11 +1367,8 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
c->HistoryRestore(); c->HistoryRestore();
} }
else else
{
if (drawMode != DrawLine && !windTool)
{ {
isMouseDown = false; isMouseDown = false;
}
zoomCursorFixed = false; zoomCursorFixed = false;
c->SetZoomEnabled(true); c->SetZoomEnabled(true);
} }