mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-02 04:22:34 +02:00
Code Issues Projects Releases Wiki Activity

Stamp selection and placements works through the zoom window, #104

Browse Source
This commit is contained in:
Simon Robertshaw
2012-08-14 15:35:03 +01:00
parent 02696b1cbe
commit 8604b30548
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/GameView.cpp
View File

@@ -951,9 +951,9 @@ void GameView::OnMouseMove(int x, int y, int dx, int dy)
if(selectMode!=SelectNone) if(selectMode!=SelectNone)
{ {
if(selectMode==PlaceSave) if(selectMode==PlaceSave)
selectPoint1 = ui::Point(x, y); selectPoint1 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y)));
if(selectPoint1.X!=-1) if(selectPoint1.X!=-1)
selectPoint2 = c->NormaliseBlockCoord(ui::Point(x, y)); selectPoint2 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y)));
return; return;
} }
currentMouse = ui::Point(x, y); currentMouse = ui::Point(x, y);
@@ -970,7 +970,7 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
{ {
if(button==BUTTON_LEFT) if(button==BUTTON_LEFT)
{ {
selectPoint1 = c->NormaliseBlockCoord(ui::Point(x, y)); selectPoint1 = c->NormaliseBlockCoord(c->PointTranslate(ui::Point(x, y)));
selectPoint2 = selectPoint1; selectPoint2 = selectPoint1;
} }
return; return;
@@ -1770,6 +1770,8 @@ void GameView::OnDraw()
thumbPos.Y = YRES-tempThumb->Size.Y; thumbPos.Y = YRES-tempThumb->Size.Y;
g->draw_image(tempThumb->Data, thumbPos.X, thumbPos.Y, tempThumb->Size.X, tempThumb->Size.Y, 128); 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 else