Permalink
Browse files

placing zoom window cancels shift-lines

  • Loading branch information...
jacob1 committed Oct 31, 2014
1 parent 02e1969 commit 56544256371bf7138c10e31c5977d68b5e436dd2
Showing with 7 additions and 3 deletions.
  1. +7 −3 src/gui/game/GameView.cpp
@@ -1042,9 +1042,9 @@ void GameView::OnMouseMove(int x, int y, int dx, int dy)
currentMouse = ui::Point(x, y);
if (selectMode != SelectNone)
{
if(selectMode == PlaceSave)
if (selectMode == PlaceSave)
selectPoint1 = c->PointTranslate(ui::Point(x, y));
if(selectPoint1.X != -1)
if (selectPoint1.X != -1)
selectPoint2 = c->PointTranslate(ui::Point(x, y));
return;
}
@@ -1096,7 +1096,11 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
void GameView::OnMouseUp(int x, int y, unsigned button)
{
if (zoomEnabled && !zoomCursorFixed)
{
zoomCursorFixed = true;
drawMode = DrawPoints;
isMouseDown = false;
}
else
{
if (selectMode != SelectNone)
@@ -1355,7 +1359,7 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
c->ChangeBrush();
break;
case 'z':
if(ctrl)
if (ctrl)
{
c->HistoryRestore();
}

0 comments on commit 5654425

Please sign in to comment.