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

fix bug with placing zoom window while saving a stamp

Browse Source
This commit is contained in:
jacob1 2014-10-31 12:17:33 -04:00
parent c7bb60559e
commit 2fc1dcbe29
1 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1059,6 +1059,8 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
{
if (altBehaviour && !shiftBehaviour && !ctrlBehaviour)
button = BUTTON_MIDDLE;
if (!(zoomEnabled && !zoomCursorFixed))
{
if (selectMode != SelectNone)
{
if (button == BUTTON_LEFT)
@ -1068,7 +1070,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
}
return;
}
if(currentMouse.X >= 0 && currentMouse.X < XRES && currentMouse.Y >= 0 && currentMouse.Y < YRES && !(zoomEnabled && !zoomCursorFixed))
if (currentMouse.X >= 0 && currentMouse.X < XRES && currentMouse.Y >= 0 && currentMouse.Y < YRES)
{
if (button == BUTTON_LEFT)
toolIndex = 0;
@ -1089,6 +1091,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
}
}
}
}
void GameView::OnMouseUp(int x, int y, unsigned button)
{