mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-17 21:51:20 +02:00
Code Issues Projects Releases Wiki Activity

Change zoom size with [ and ], fixes #90

Browse Source
This commit is contained in:
Simon Robertshaw
2012-08-10 22:09:04 +01:00
parent c1d7de24f2
commit 92311a38c0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/GameController.cpp
View File

@@ -264,9 +264,9 @@ void GameController::AdjustZoomSize(int direction, bool logarithmic)
{ {
int newSize; int newSize;
if(logarithmic) if(logarithmic)
newSize = gameModel->GetZoomSize()+direction;
else
newSize = gameModel->GetZoomSize()+(((gameModel->GetZoomSize()/10)>0?(gameModel->GetZoomSize()/10):1)*direction); newSize = gameModel->GetZoomSize()+(((gameModel->GetZoomSize()/10)>0?(gameModel->GetZoomSize()/10):1)*direction);
else
newSize = gameModel->GetZoomSize()+direction;
if(newSize<5) if(newSize<5)
newSize = 5; newSize = 5;
if(newSize>64) if(newSize>64)

10
src/game/GameView.cpp
View File

@@ -1275,10 +1275,16 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
c->OpenStamps(); c->OpenStamps();
break; break;
case ']': case ']':
c->AdjustBrushSize(1, !alt, shiftBehaviour, ctrlBehaviour); if(zoomEnabled && !zoomCursorFixed)
c->AdjustZoomSize(1, !alt);
else
c->AdjustBrushSize(1, !alt, shiftBehaviour, ctrlBehaviour);
break; break;
case '[': case '[':
c->AdjustBrushSize(-1, !alt, shiftBehaviour, ctrlBehaviour); if(zoomEnabled && !zoomCursorFixed)
c->AdjustZoomSize(-1, !alt);
else
c->AdjustBrushSize(-1, !alt, shiftBehaviour, ctrlBehaviour);
break; break;
case 'i': case 'i':
if(ctrl) if(ctrl)