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

TraceRestrictSlots: Fix highlighting behavior. Marking group ALL_SLOTS didn't reset the selected slot and dragging from ALL to ALL threw an unnecessary error.

Browse Source 
(cherry picked from commit c76b560134bd8d9869ead872f7a434e61a5c5a48)

Fixes: #38
This commit is contained in:
keldorkatarn
2018-04-11 21:24:16 +02:00
committed by Jonathan G Rennison
parent 2f3e4044b7
commit f10840438e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tracerestrict_gui.cpp
View File

@@ -2915,6 +2915,7 @@ public:
case WID_TRSL_ALL_VEHICLES: // All vehicles button case WID_TRSL_ALL_VEHICLES: // All vehicles button
if (this->vli.index != ALL_TRAINS_TRACE_RESTRICT_SLOT_ID) { if (this->vli.index != ALL_TRAINS_TRACE_RESTRICT_SLOT_ID) {
this->vli.index = ALL_TRAINS_TRACE_RESTRICT_SLOT_ID; this->vli.index = ALL_TRAINS_TRACE_RESTRICT_SLOT_ID;
this->slot_sel = INVALID_TRACE_RESTRICT_SLOT_ID;
this->vehicles.ForceRebuild(); this->vehicles.ForceRebuild();
this->SetDirty(); this->SetDirty();
} }
@@ -2973,12 +2974,14 @@ public:
{ {
switch (widget) { switch (widget) {
case WID_TRSL_ALL_VEHICLES: // All vehicles case WID_TRSL_ALL_VEHICLES: // All vehicles
DoCommandP(0, this->slot_sel, this->vehicle_sel, CMD_REMOVE_VEHICLE_TRACERESTRICT_SLOT | CMD_MSG(STR_TRACE_RESTRICT_ERROR_SLOT_CAN_T_REMOVE_VEHICLE)); if (this->slot_sel != INVALID_TRACE_RESTRICT_SLOT_ID) {
DoCommandP(0, this->slot_sel, this->vehicle_sel, CMD_REMOVE_VEHICLE_TRACERESTRICT_SLOT | CMD_MSG(STR_TRACE_RESTRICT_ERROR_SLOT_CAN_T_REMOVE_VEHICLE));
this->vehicle_sel = INVALID_VEHICLE; this->vehicle_sel = INVALID_VEHICLE;
this->slot_over = INVALID_GROUP; this->slot_over = INVALID_GROUP;
this->SetDirty(); this->SetDirty();
}
break; break;
case WID_TRSL_LIST_SLOTS: { // Matrix slot case WID_TRSL_LIST_SLOTS: { // Matrix slot