summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-04-28 01:45:06 -0400
committerBen Boeckel <MathStuf@gmail.com>2009-04-28 01:45:06 -0400
commite223b742f062f795959800f4d605dbb8d3e4dee8 (patch)
treea3978d3e728cbb89869089db7d98deb18a854e35
parentc5cb441076e95564c1ee4f721fab48c6610cccb9 (diff)
Its not Invalid anymore
-rw-r--r--sigmodr/widgets/mapeditor/WorldMapPlacement.cpp37
1 files changed, 17 insertions, 20 deletions
diff --git a/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp b/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp
index d8083783..2ebf68b4 100644
--- a/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp
+++ b/sigmodr/widgets/mapeditor/WorldMapPlacement.cpp
@@ -374,28 +374,25 @@ QPoint WorldMapPlacement::find(const QPoint& point)
}
}
const Corner corner = qMax(concaveTurnDirection(last, cur, next), convexTurnDirection(last, cur, next));
- if (corner != Invalid)
+ switch (corner)
{
- switch (corner)
- {
- case TopLeft:
- rect.moveTopLeft(cur);
- break;
- case TopRight:
- rect.moveTopRight(cur);
- break;
- case BottomRight:
- rect.moveBottomRight(cur);
- break;
- case BottomLeft:
- rect.moveBottomLeft(cur);
- break;
- default:
- break;
- }
- if (collides(rect, m_polygons).isEmpty())
- best = closer(best, rect.toRect(), point);
+ case TopLeft:
+ rect.moveTopLeft(cur);
+ break;
+ case TopRight:
+ rect.moveTopRight(cur);
+ break;
+ case BottomRight:
+ rect.moveBottomRight(cur);
+ break;
+ case BottomLeft:
+ rect.moveBottomLeft(cur);
+ break;
+ default:
+ break;
}
+ if (collides(rect, m_polygons).isEmpty())
+ best = closer(best, rect.toRect(), point);
}
}
return best.topLeft();