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

Fix #313: Make remove and routing restriction buttons mutually exclusive

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-08-21 18:58:48 +01:00
parent f1fde8c684
commit 6944e689a0
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rail_gui.cpp
View File

@@ -331,6 +331,10 @@ static void ToggleRailButton_Remove(Window *w)
w->SetWidgetDirty(WID_RAT_REMOVE); w->SetWidgetDirty(WID_RAT_REMOVE);
_remove_button_clicked = w->IsWidgetLowered(WID_RAT_REMOVE); _remove_button_clicked = w->IsWidgetLowered(WID_RAT_REMOVE);
SetSelectionRed(_remove_button_clicked); SetSelectionRed(_remove_button_clicked);
if (_remove_button_clicked && _trace_restrict_button) {
_trace_restrict_button = false;
InvalidateWindowData(WC_BUILD_SIGNAL, 0);
}
} }
/** /**
@@ -1820,6 +1824,14 @@ private:
this->GetWidget<NWidgetStacked>(WID_BS_PROGRAM_SEL)->SetDisplayedPlane(show_progsig ? 0 : 1); this->GetWidget<NWidgetStacked>(WID_BS_PROGRAM_SEL)->SetDisplayedPlane(show_progsig ? 0 : 1);
} }
void ClearRemoveState()
{
if (_remove_button_clicked) {
Window *w = FindWindowById(WC_BUILD_TOOLBAR, TRANSPORT_RAIL);
if (w != nullptr) ToggleRailButton_Remove(w);
}
}
public: public:
BuildSignalWindow(WindowDesc *desc, Window *parent) : PickerWindowBase(desc, parent) BuildSignalWindow(WindowDesc *desc, Window *parent) : PickerWindowBase(desc, parent)
{ {
@@ -1928,10 +1940,7 @@ public:
_cur_signal_variant = widget >= WID_BS_ELECTRIC_NORM ? SIG_ELECTRIC : SIG_SEMAPHORE; _cur_signal_variant = widget >= WID_BS_ELECTRIC_NORM ? SIG_ELECTRIC : SIG_SEMAPHORE;
/* If 'remove' button of rail build toolbar is active, disable it. */ /* If 'remove' button of rail build toolbar is active, disable it. */
if (_remove_button_clicked) { ClearRemoveState();
Window *w = FindWindowById(WC_BUILD_TOOLBAR, TRANSPORT_RAIL);
if (w != nullptr) ToggleRailButton_Remove(w);
}
break; break;
case WID_BS_CONVERT: case WID_BS_CONVERT:
@@ -1947,6 +1956,7 @@ public:
if (_trace_restrict_button) { if (_trace_restrict_button) {
_convert_signal_button = false; _convert_signal_button = false;
_program_signal_button = false; _program_signal_button = false;
ClearRemoveState();
} }
break; break;