dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix old polyrail tooltips being left on screen

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-04-05 11:37:37 +01:00
parent 95fb222852
commit 7ad8b69a74
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/viewport.cpp
View File

@@ -265,6 +265,7 @@ struct ViewportDrawer {
static void MarkRouteStepDirty(RouteStepsMap::const_iterator cit); static void MarkRouteStepDirty(RouteStepsMap::const_iterator cit);
static void MarkRouteStepDirty(const TileIndex tile, uint order_nr); static void MarkRouteStepDirty(const TileIndex tile, uint order_nr);
static void HideMeasurementTooltips();
static DrawPixelInfo _dpi_for_text; static DrawPixelInfo _dpi_for_text;
static ViewportDrawer _vd; static ViewportDrawer _vd;
@@ -4247,6 +4248,7 @@ HandleViewportClickedResult HandleViewportClicked(const Viewport *vp, int x, int
static bool stop_snap_on_double_click = false; static bool stop_snap_on_double_click = false;
if (double_click && stop_snap_on_double_click) { if (double_click && stop_snap_on_double_click) {
SetRailSnapMode(RSM_NO_SNAP); SetRailSnapMode(RSM_NO_SNAP);
HideMeasurementTooltips();
return HVCR_DENY; return HVCR_DENY;
} }
stop_snap_on_double_click = !(_thd.drawstyle & HT_LINE) || (_thd.dir2 == HT_DIR_END); stop_snap_on_double_click = !(_thd.drawstyle & HT_LINE) || (_thd.dir2 == HT_DIR_END);
@@ -5288,6 +5290,7 @@ static HighLightStyle CalcPolyrailDrawstyle(Point pt, bool dragging)
if (snap_mode == RSM_SNAP_TO_TILE && GetRailSnapTile() == TileVirtXY(pt.x, pt.y)) { if (snap_mode == RSM_SNAP_TO_TILE && GetRailSnapTile() == TileVirtXY(pt.x, pt.y)) {
_thd.selend.x = pt.x; _thd.selend.x = pt.x;
_thd.selend.y = pt.y; _thd.selend.y = pt.y;
HideMeasurementTooltips();
return GetAutorailHT(pt.x, pt.y); return GetAutorailHT(pt.x, pt.y);
} }
@@ -5307,7 +5310,10 @@ static HighLightStyle CalcPolyrailDrawstyle(Point pt, bool dragging)
snap_point = FindBestPolyline(pt, _rail_snap_points.data(), _rail_snap_points.size(), &line); snap_point = FindBestPolyline(pt, _rail_snap_points.data(), _rail_snap_points.size(), &line);
} }
if (snap_point == nullptr) return HT_NONE; // no match if (snap_point == nullptr) {
HideMeasurementTooltips();
return HT_NONE; // no match
}
if (lock_snapping && _current_snap_lock.x == -1) { if (lock_snapping && _current_snap_lock.x == -1) {
/* lock down the snap point */ /* lock down the snap point */