From 150114c11fa65aa1c6c29abab8332bf6749da372 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Fri, 10 Aug 2012 19:11:59 +0100 Subject: [PATCH] Alt Z to stick zoom to cursor, disable cursor rendering when zoom is being placed. Fixes #32 --- src/game/GameView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 073d8dad4..6f5205205 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -1318,7 +1318,7 @@ void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bo disableShiftBehaviour(); break; case 'z': - if(!zoomCursorFixed) + if(!zoomCursorFixed && !alt) c->SetZoomEnabled(false); break; } @@ -1647,7 +1647,7 @@ void GameView::OnDraw() { ren->clearScreen(1.0f); ren->RenderBegin(); - if(selectMode == SelectNone && activeBrush && currentMouse.X > 0 && currentMouse.X < XRES && currentMouse.Y > 0 && currentMouse.Y < YRES) + if(selectMode == SelectNone && (!zoomEnabled || zoomCursorFixed) && activeBrush && currentMouse.X > 0 && currentMouse.X < XRES && currentMouse.Y > 0 && currentMouse.Y < YRES) { ui::Point finalCurrentMouse = c->PointTranslate(currentMouse); ui::Point initialDrawPoint = drawPoint1;