summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/airport_gui.cpp3
-rw-r--r--src/dock_gui.cpp3
-rw-r--r--src/rail_gui.cpp3
-rw-r--r--src/road_gui.cpp3
-rw-r--r--src/station_gui.cpp72
-rw-r--r--src/tilehighlight_type.h2
-rw-r--r--src/viewport.cpp2
7 files changed, 88 insertions, 0 deletions
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 8e436f1cb..0fff03a3c 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -79,6 +79,7 @@ struct BuildAirToolbarWindow : Window {
~BuildAirToolbarWindow()
{
+ if (this->IsWidgetLowered(WID_AT_AIRPORT)) SetViewportCatchmentStation(nullptr, true);
if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
}
@@ -143,6 +144,8 @@ struct BuildAirToolbarWindow : Window {
void OnPlaceObjectAbort() override
{
+ if (this->IsWidgetLowered(WID_AT_AIRPORT)) SetViewportCatchmentStation(nullptr, true);
+
this->RaiseButtons();
DeleteWindowById(WC_BUILD_STATION, TRANSPORT_AIR);
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index 95989dc03..d74c6d2ca 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -105,6 +105,7 @@ struct BuildDocksToolbarWindow : Window {
~BuildDocksToolbarWindow()
{
+ if (this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true);
if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
}
@@ -248,6 +249,8 @@ struct BuildDocksToolbarWindow : Window {
void OnPlaceObjectAbort() override
{
+ if (this->IsWidgetLowered(WID_DT_STATION)) SetViewportCatchmentStation(nullptr, true);
+
this->RaiseButtons();
DeleteWindowById(WC_BUILD_STATION, TRANSPORT_WATER);
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 54aaf61f6..6d70686fd 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -432,6 +432,7 @@ struct BuildRailToolbarWindow : Window {
~BuildRailToolbarWindow()
{
+ if (this->IsWidgetLowered(WID_RAT_BUILD_STATION)) SetViewportCatchmentStation(nullptr, true);
if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
}
@@ -743,6 +744,8 @@ struct BuildRailToolbarWindow : Window {
void OnPlaceObjectAbort() override
{
+ if (this->IsWidgetLowered(WID_RAT_BUILD_STATION)) SetViewportCatchmentStation(nullptr, true);
+
this->RaiseButtons();
this->DisableWidget(WID_RAT_REMOVE);
this->SetWidgetDirty(WID_RAT_REMOVE);
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 27c8fe8e7..78f5377da 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -327,6 +327,7 @@ struct BuildRoadToolbarWindow : Window {
~BuildRoadToolbarWindow()
{
+ if (this->IsWidgetLowered(WID_ROT_BUS_STATION) || this->IsWidgetLowered(WID_ROT_TRUCK_STATION)) SetViewportCatchmentStation(nullptr, true);
if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
}
@@ -545,6 +546,8 @@ struct BuildRoadToolbarWindow : Window {
void OnPlaceObjectAbort() override
{
+ if (this->IsWidgetLowered(WID_ROT_BUS_STATION) || this->IsWidgetLowered(WID_ROT_TRUCK_STATION)) SetViewportCatchmentStation(nullptr, true);
+
this->RaiseButtons();
this->SetWidgetsDisabledState(true,
WID_ROT_REMOVE,
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 1cc6a126f..31da16238 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -81,15 +81,66 @@ int DrawStationCoverageAreaText(int left, int right, int top, StationCoverageTyp
}
/**
+ * Find stations adjacent to the current tile highlight area, so that existing coverage
+ * area can be drawn.
+ */
+static void FindStationsAroundSelection()
+{
+ /* With distant join we don't know which station will be selected, so don't show any */
+ if (_ctrl_pressed) {
+ SetViewportCatchmentStation(nullptr, true);
+ return;
+ }
+
+ /* Tile area for TileHighlightData */
+ TileArea location(TileVirtXY(_thd.pos.x, _thd.pos.y), _thd.size.x / TILE_SIZE - 1, _thd.size.y / TILE_SIZE - 1);
+
+ /* Extended area by one tile */
+ uint x = TileX(location.tile);
+ uint y = TileY(location.tile);
+
+ int max_c = 1;
+ TileArea ta(TileXY(max<int>(0, x - max_c), max<int>(0, y - max_c)), TileXY(min<int>(MapMaxX(), x + location.w + max_c), min<int>(MapMaxY(), y + location.h + max_c)));
+
+ Station *adjacent = nullptr;
+
+ /* Direct loop instead of FindStationsAroundTiles as we are not interested in catchment area */
+ TILE_AREA_LOOP(tile, ta) {
+ if (IsTileType(tile, MP_STATION) && GetTileOwner(tile) == _local_company) {
+ Station *st = Station::GetByTile(tile);
+ if (st == nullptr) continue;
+ if (adjacent != nullptr && st != adjacent) {
+ /* Multiple nearby, distant join is required. */
+ adjacent = nullptr;
+ break;
+ }
+ adjacent = st;
+ }
+ }
+ SetViewportCatchmentStation(adjacent, true);
+}
+
+/**
* Check whether we need to redraw the station coverage text.
* If it is needed actually make the window for redrawing.
* @param w the window to check.
*/
void CheckRedrawStationCoverage(const Window *w)
{
+ /* Test if ctrl state changed */
+ static bool _last_ctrl_pressed;
+ if (_ctrl_pressed != _last_ctrl_pressed) {
+ _thd.dirty = 0xff;
+ _last_ctrl_pressed = _ctrl_pressed;
+ }
+
if (_thd.dirty & 1) {
_thd.dirty &= ~1;
w->SetDirty();
+
+ if (_settings_client.gui.station_show_coverage && _thd.drawstyle == HT_RECT) {
+ FindStationsAroundSelection();
+ }
}
}
@@ -2256,11 +2307,15 @@ struct SelectStationWindow : Window {
this->GetWidget<NWidgetCore>(WID_JS_CAPTION)->widget_data = T::EXPECTED_FACIL == FACIL_WAYPOINT ? STR_JOIN_WAYPOINT_CAPTION : STR_JOIN_STATION_CAPTION;
this->FinishInitNested(0);
this->OnInvalidateData(0);
+
+ _thd.freeze = true;
}
~SelectStationWindow()
{
if (_settings_client.gui.station_show_coverage) SetViewportCatchmentStation(nullptr, true);
+
+ _thd.freeze = false;
}
void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
@@ -2350,6 +2405,23 @@ struct SelectStationWindow : Window {
this->vscroll->SetCount((uint)_stations_nearby_list.size() + 1);
this->SetDirty();
}
+
+ void OnMouseOver(Point pt, int widget) override
+ {
+ if (widget != WID_JS_PANEL) {
+ SetViewportCatchmentStation(nullptr, true);
+ return;
+ }
+
+ /* Show coverage area of station under cursor */
+ uint st_index = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_JS_PANEL, WD_FRAMERECT_TOP);
+ if (st_index == 0 || st_index > _stations_nearby_list.size()) {
+ SetViewportCatchmentStation(nullptr, true);
+ } else {
+ st_index--;
+ SetViewportCatchmentStation(Station::Get(_stations_nearby_list[st_index]), true);
+ }
+ }
};
static WindowDesc _select_station_desc(
diff --git a/src/tilehighlight_type.h b/src/tilehighlight_type.h
index 3d64248df..f1109bf2e 100644
--- a/src/tilehighlight_type.h
+++ b/src/tilehighlight_type.h
@@ -52,6 +52,8 @@ struct TileHighlightData {
Point outersize; ///< Size, in tile "units", of the blue coverage area excluding the side of the selected area.
bool diagonal; ///< Whether the dragged area is a 45 degrees rotated rectangle.
+ bool freeze; ///< Freeze highlight in place.
+
Point new_pos; ///< New value for \a pos; used to determine whether to redraw the selection.
Point new_size; ///< New value for \a size; used to determine whether to redraw the selection.
Point new_outersize; ///< New value for \a outersize; used to determine whether to redraw the selection.
diff --git a/src/viewport.cpp b/src/viewport.cpp
index c8ae46abd..27e8f2eca 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -2445,6 +2445,8 @@ void UpdateTileSelection()
int x1;
int y1;
+ if (_thd.freeze) return;
+
HighLightStyle new_drawstyle = HT_NONE;
bool new_diagonal = false;
generated by cgit v1.2.3-54-g00ecf (git 2.44.0) at 2024-07-19 10:27:20 +0000