diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-10 21:09:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-10 21:09:04 (GMT) |
| commit | 92311a38c0c9b9e3ea996c1131a4a1523f62e57f (patch) | |
| tree | c08645604a258d1ebfe8b97807e4d1170c938a45 /src | |
| parent | c1d7de24f2a919ee2bb96889a92b5d90601bcd53 (diff) | |
| download | powder-92311a38c0c9b9e3ea996c1131a4a1523f62e57f.zip powder-92311a38c0c9b9e3ea996c1131a4a1523f62e57f.tar.gz | |
Change zoom size with [ and ], fixes #90
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/GameController.cpp | 4 | ||||
| -rw-r--r-- | src/game/GameView.cpp | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index c3281b6..17a6d4f 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -264,9 +264,9 @@ void GameController::AdjustZoomSize(int direction, bool logarithmic) { int newSize; if(logarithmic) - newSize = gameModel->GetZoomSize()+direction; - else newSize = gameModel->GetZoomSize()+(((gameModel->GetZoomSize()/10)>0?(gameModel->GetZoomSize()/10):1)*direction); + else + newSize = gameModel->GetZoomSize()+direction; if(newSize<5) newSize = 5; if(newSize>64) diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 6f52052..1876b05 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -1275,10 +1275,16 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool c->OpenStamps(); break; case ']': - c->AdjustBrushSize(1, !alt, shiftBehaviour, ctrlBehaviour); + if(zoomEnabled && !zoomCursorFixed) + c->AdjustZoomSize(1, !alt); + else + c->AdjustBrushSize(1, !alt, shiftBehaviour, ctrlBehaviour); break; case '[': - c->AdjustBrushSize(-1, !alt, shiftBehaviour, ctrlBehaviour); + if(zoomEnabled && !zoomCursorFixed) + c->AdjustZoomSize(-1, !alt); + else + c->AdjustBrushSize(-1, !alt, shiftBehaviour, ctrlBehaviour); break; case 'i': if(ctrl) |