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

Fix cursour falling just out zoom window

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-30 00:18:42 +01:00
parent 58dc2559aa
commit 6dbcd3cc59
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/GameController.cpp
View File

@ -336,6 +336,15 @@ void GameController::AdjustZoomSize(int direction, bool logarithmic)
ui::Point GameController::PointTranslate(ui::Point point) ui::Point GameController::PointTranslate(ui::Point point)
{ {
if(point.X >= XRES)
point.X = XRES-1;
if(point.Y >= YRES)
point.Y = YRES+1;
if(point.Y < 0)
point.Y = 0;
if(point.X < 0)
point.X = 0;
bool zoomEnabled = gameModel->GetZoomEnabled(); bool zoomEnabled = gameModel->GetZoomEnabled();
if(!zoomEnabled) if(!zoomEnabled)
return point; return point;
@ -344,7 +353,7 @@ ui::Point GameController::PointTranslate(ui::Point point)
ui::Point zoomWindowPosition = gameModel->GetZoomWindowPosition(); ui::Point zoomWindowPosition = gameModel->GetZoomWindowPosition();
ui::Point zoomWindowSize = ui::Point(gameModel->GetZoomSize()*zoomFactor, gameModel->GetZoomSize()*zoomFactor); ui::Point zoomWindowSize = ui::Point(gameModel->GetZoomSize()*zoomFactor, gameModel->GetZoomSize()*zoomFactor);
if(point.X > zoomWindowPosition.X && point.X > zoomWindowPosition.Y && point.X < zoomWindowPosition.X+zoomWindowSize.X && point.Y < zoomWindowPosition.Y+zoomWindowSize.Y) if(point.X >= zoomWindowPosition.X && point.X >= zoomWindowPosition.Y && point.X <= zoomWindowPosition.X+zoomWindowSize.X && point.Y <= zoomWindowPosition.Y+zoomWindowSize.Y)
return ((point-zoomWindowPosition)/gameModel->GetZoomFactor())+gameModel->GetZoomPosition(); return ((point-zoomWindowPosition)/gameModel->GetZoomFactor())+gameModel->GetZoomPosition();
return point; return point;
} }