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

Simplify lockNondominantAxis() and add comment

Browse source
This commit is contained in:
BigBahss 2020-09-07 03:13:37 -04:00 committed by garak
parent bb4e361f39
commit 939ec2520d
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/ui/mappixmapitem.cpp
View file

@ -280,26 +280,25 @@ void MapPixmapItem::paintSmartPath(int x, int y, bool fromScriptCall) {
} }
void MapPixmapItem::lockNondominantAxis(QGraphicsSceneMouseEvent *event) { void MapPixmapItem::lockNondominantAxis(QGraphicsSceneMouseEvent *event) {
// Return if an axis is already locked /* Return if an axis is already locked, or if the mouse has been released. The mouse release check is necessary
if (this->lockedAxis != MapPixmapItem::Axis::None) return; * because MapPixmapItem::mouseReleaseEvent seems to get called before this function, which would unlock the axis
* and then get immediately re-locked here until the next ctrl-click. */
if (this->lockedAxis != MapPixmapItem::Axis::None || event->type() == QEvent::GraphicsSceneMouseRelease)
return;
QPointF pos = event->pos(); QPointF pos = event->pos();
int x = static_cast<int>(pos.x()) / 16; int x = static_cast<int>(pos.x()) / 16;
int y = static_cast<int>(pos.y()) / 16; int y = static_cast<int>(pos.y()) / 16;
if (event->modifiers() & Qt::ControlModifier) { if (!this->prevStraightPathState) {
if (!this->prevStraightPathState) { this->prevStraightPathState = true;
this->prevStraightPathState = true; this->straight_path_initial_x = x;
this->straight_path_initial_x = x; this->straight_path_initial_y = y;
this->straight_path_initial_y = y;
}
} else {
this->prevStraightPathState = false;
} }
// Only lock an axis when the current pos != initial and not after the mouse gets released // Only lock an axis when the current position != initial
int xDiff = x - this->straight_path_initial_x; int xDiff = x - this->straight_path_initial_x;
int yDiff = y - this->straight_path_initial_y; int yDiff = y - this->straight_path_initial_y;
if ((xDiff || yDiff) && event->type() != QEvent::GraphicsSceneMouseRelease) { if (xDiff || yDiff) {
if (abs(xDiff) < abs(yDiff)) { if (abs(xDiff) < abs(yDiff)) {
this->lockedAxis = MapPixmapItem::Axis::X; this->lockedAxis = MapPixmapItem::Axis::X;
} else { } else {