|
|
|
@ -1753,8 +1753,9 @@ public:
|
|
|
|
|
list.push_back(std::make_unique<DropDownListStringItem>(this->GetCargoFilterLabel(CF_NONE), CF_NONE, false));
|
|
|
|
|
|
|
|
|
|
/* Add cargos */
|
|
|
|
|
Dimension d = GetLargestCargoIconSize();
|
|
|
|
|
for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
|
|
|
|
|
list.push_back(std::make_unique<DropDownListStringItem>(cs->name, cs->Index(), false));
|
|
|
|
|
list.push_back(std::make_unique<DropDownListIconItem>(d, cs->GetCargoIcon(), PAL_NONE, cs->name, cs->Index(), false));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return list;
|
|
|
|
@ -3088,8 +3089,9 @@ struct IndustryCargoesWindow : public Window {
|
|
|
|
|
|
|
|
|
|
case WID_IC_CARGO_DROPDOWN: {
|
|
|
|
|
DropDownList lst;
|
|
|
|
|
Dimension d = GetLargestCargoIconSize();
|
|
|
|
|
for (const CargoSpec *cs : _sorted_standard_cargo_specs) {
|
|
|
|
|
lst.push_back(std::make_unique<DropDownListStringItem>(cs->name, cs->Index(), false));
|
|
|
|
|
lst.push_back(std::make_unique<DropDownListIconItem>(d, cs->GetCargoIcon(), PAL_NONE, cs->name, cs->Index(), false));
|
|
|
|
|
}
|
|
|
|
|
if (!lst.empty()) {
|
|
|
|
|
int selected = (this->ind_cargo >= NUM_INDUSTRYTYPES) ? (int)(this->ind_cargo - NUM_INDUSTRYTYPES) : -1;
|
|
|
|
|