From 8604b3054858fbeed30b82120bb1f401c50fe542 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Tue, 14 Aug 2012 15:35:03 +0100 Subject: [PATCH] Stamp selection and placements works through the zoom window, #104 --- src/game/GameView.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 8b553b960..435e27767 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -951,9 +951,9 @@ void GameView::OnMouseMove(int x, int y, int dx, int dy) if(selectMode!=SelectNone) { if(selectMode==PlaceSave) - selectPoint1 = ui::Point(x, y); + selectPoint1 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y))); if(selectPoint1.X!=-1) - selectPoint2 = c->NormaliseBlockCoord(ui::Point(x, y)); + selectPoint2 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y))); return; } currentMouse = ui::Point(x, y); @@ -970,7 +970,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button) { if(button==BUTTON_LEFT) { - selectPoint1 = c->NormaliseBlockCoord(ui::Point(x, y)); + selectPoint1 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y))); selectPoint2 = selectPoint1; } return; @@ -1770,6 +1770,8 @@ void GameView::OnDraw() thumbPos.Y = YRES-tempThumb->Size.Y; g->draw_image(tempThumb->Data, thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y, 128); + + g->xor_rect(thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y); } } else