atiran/porymap
3
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix bug where dragging the metatile selector would visually extend beyond map boundary

Browse source
This commit is contained in:
Marcus Huderle 2020-02-12 11:52:05 -06:00
parent 33a2cfe06a
commit 5978aedc30
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/cursortilerect.cpp
View file

@ -100,6 +100,8 @@ void CursorTileRect::updateLocation(int coordX, int coordY)
}
}
coordX = qMax(coordX, 0);
coordY = qMax(coordY, 0);
this->setX(coordX * 16);
this->setY(coordY * 16);
this->setVisible(*this->enabled && this->visible);

5
src/ui/mappixmapitem.cpp
View file

@ -226,11 +226,10 @@ void MapPixmapItem::updateMetatileSelection(QGraphicsSceneMouseEvent *event) {
Block *block = map->getBlock(x, y);
this->metatileSelector->selectFromMap(block->tile, block->collision, block->elevation);
} else if (event->type() == QEvent::GraphicsSceneMouseMove) {
QPoint pos = QPoint(x, y);
int x1 = selection_origin.x();
int y1 = selection_origin.y();
int x2 = pos.x();
int y2 = pos.y();
int x2 = x;
int y2 = y;
if (x1 > x2) SWAP(x1, x2);
if (y1 > y2) SWAP(y1, y2);
selection.clear();