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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
This commit is contained in:
Jonathan G Rennison
2023-04-17 20:51:54 +01:00
parent e862a67d2b e5af5907ec
commit 7da25820ea
19 changed files with 125 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/industry_gui.cpp
View File

@@ -3118,7 +3118,7 @@ struct IndustryCargoesWindow : public Window {
add_item(STR_INDUSTRY_CARGOES_PRODUCERS, ILM_IN);
add_item(STR_INDUSTRY_CARGOES_CUSTOMERS, ILM_OUT);
int selected = (this->IsWidgetLowered(WID_IC_NOTIFY)) ? (int)_link_mode : -1;
ShowDropDownList(this, std::move(list), selected, WID_IC_NOTIFY, 0, true);
ShowDropDownList(this, std::move(list), selected, WID_IC_NOTIFY);
}
break;
@@ -3129,7 +3129,7 @@ struct IndustryCargoesWindow : public Window {
}
if (!lst.empty()) {
int selected = (this->ind_cargo >= NUM_INDUSTRYTYPES) ? (int)(this->ind_cargo - NUM_INDUSTRYTYPES) : -1;
ShowDropDownList(this, std::move(lst), selected, WID_IC_CARGO_DROPDOWN, 0, true);
ShowDropDownList(this, std::move(lst), selected, WID_IC_CARGO_DROPDOWN);
}
break;
}
@@ -3143,7 +3143,7 @@ struct IndustryCargoesWindow : public Window {
}
if (!lst.empty()) {
int selected = (this->ind_cargo < NUM_INDUSTRYTYPES) ? (int)this->ind_cargo : -1;
ShowDropDownList(this, std::move(lst), selected, WID_IC_IND_DROPDOWN, 0, true);
ShowDropDownList(this, std::move(lst), selected, WID_IC_IND_DROPDOWN);
}
break;
}