matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix paste previews being positioned incorrectly

Browse Source 
Recent changes made to multiple instances of paste placement code caused inconsistencies between what paste previews suggested would happen and what actually happened during pasting. Relevant code factored out.
This commit is contained in:
Tamás Bálint Misius 2023-05-14 20:44:13 +02:00
parent 18084d5aa0
commit c0a2370c77
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/game/GameView.cpp
View File

@ -1179,6 +1179,11 @@ void GameView::OnMouseDown(int x, int y, unsigned button)
}
}
Vec2<int> GameView::PlaceSavePos() const
{
return c->NormaliseBlockCoord(selectPoint2 + placeSaveOffset * CELL + Vec2(1, 1) * CELL / 2).Clamp(RectBetween(Vec2<int>::Zero, RES - placeSaveThumb->Size()));
}
void GameView::OnMouseUp(int x, int y, unsigned button)
{
currentMouse = ui::Point(x, y);
@ -1199,7 +1204,7 @@ void GameView::OnMouseUp(int x, int y, unsigned button)
{
if (placeSaveThumb && y <= WINDOWH-BARSIZE)
{
c->PlaceSave((selectPoint2 / CELL + placeSaveOffset).Clamp((CELLS - placeSaveThumb->Size() / CELL).OriginRect()));
c->PlaceSave(PlaceSavePos() / CELL);
}
}
else
@ -2172,9 +2177,7 @@ void GameView::OnDraw()
{
if(placeSaveThumb && selectPoint2.X!=-1)
{
auto thumb = selectPoint2 + placeSaveOffset * CELL + Vec2(1, 1) * CELL / 2;
thumb = c->NormaliseBlockCoord(thumb).Clamp(RectBetween(Vec2<int>::Zero, RES - placeSaveThumb->Size()));
auto rect = RectSized(thumb, placeSaveThumb->Size());
auto rect = RectSized(PlaceSavePos(), placeSaveThumb->Size());
ren->BlendImage(placeSaveThumb->Data(), 0x80, rect);
ren->XorDottedRect(rect);
}

3
src/gui/game/GameView.h
View File

@ -139,6 +139,9 @@ private:
void disableAltBehaviour();
void UpdateDrawMode();
void UpdateToolStrength();
Vec2<int> PlaceSavePos() const;
public:
GameView();
virtual ~GameView();