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

Use DropDownListCheckedItem for order colour selection

Browse Source 
Fix divider in manage order dropdown
This commit is contained in:
Jonathan G Rennison
2024-01-02 19:20:13 +00:00
parent 8751bd2ba7
commit ae4f57240c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/order_gui.cpp
View File

@@ -2785,13 +2785,14 @@ public:
if (order == nullptr) break; if (order == nullptr) break;
DropDownList list; DropDownList list;
list.emplace_back(new DropDownListStringItem(STR_ORDER_DUPLICATE_ORDER, 0, false)); list.push_back(std::make_unique<DropDownListStringItem>(STR_ORDER_DUPLICATE_ORDER, 0, false));
if (order->IsType(OT_CONDITIONAL)) list.emplace_back(new DropDownListStringItem(STR_ORDER_CHANGE_JUMP_TARGET, 1, false)); if (order->IsType(OT_CONDITIONAL)) list.push_back(std::make_unique<DropDownListStringItem>(STR_ORDER_CHANGE_JUMP_TARGET, 1, false));
if (!order->IsType(OT_IMPLICIT)) { if (!order->IsType(OT_IMPLICIT)) {
list.emplace_back(new DropDownListItem(-1, false)); list.push_back(std::make_unique<DropDownListDividerItem>(-1, false));
list.emplace_back(new DropDownListStringItem(STR_COLOUR_DEFAULT, 0x100 + INVALID_COLOUR, false)); const Colours current_colour = order->GetColour();
list.push_back(std::make_unique<DropDownListCheckedItem>(current_colour == INVALID_COLOUR, STR_COLOUR_DEFAULT, 0x100 + INVALID_COLOUR, false));
auto add_colour = [&](Colours colour) { auto add_colour = [&](Colours colour) {
list.emplace_back(new DropDownListStringItem(STR_COLOUR_DARK_BLUE + colour, 0x100 + colour, false)); list.push_back(std::make_unique<DropDownListCheckedItem>(current_colour == colour, STR_COLOUR_DARK_BLUE + colour, 0x100 + colour, false));
}; };
add_colour(COLOUR_YELLOW); add_colour(COLOUR_YELLOW);
add_colour(COLOUR_LIGHT_BLUE); add_colour(COLOUR_LIGHT_BLUE);
@@ -2799,7 +2800,7 @@ public:
add_colour(COLOUR_ORANGE); add_colour(COLOUR_ORANGE);
add_colour(COLOUR_PINK); add_colour(COLOUR_PINK);
} }
ShowDropDownList(this, std::move(list), 0x100 + order->GetColour(), widget, 0, false, DDSF_LOST_FOCUS); ShowDropDownList(this, std::move(list), -1, widget, 0, false, DDSF_LOST_FOCUS);
break; break;
} }