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

Tracerestrict: Make condition type dropdown variable width

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-11-27 17:44:14 +00:00
parent 2ad446369d
commit ec339b1dfa
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tracerestrict_gui.cpp
View File

@@ -1585,7 +1585,7 @@ public:
if (type != TRIT_NULL) { if (type != TRIT_NULL) {
uint32 hide_mask = 0; uint32 hide_mask = 0;
const TraceRestrictDropDownListSet *set = GetTypeDropDownListSet(type, &hide_mask); const TraceRestrictDropDownListSet *set = GetTypeDropDownListSet(type, &hide_mask);
this->ShowDropDownListWithValue(set, type, false, widget, 0, hide_mask, 0); this->ShowDropDownListWithValue(set, type, false, widget, 0, hide_mask, UINT_MAX);
} }
break; break;
} }

10
src/widgets/dropdown.cpp
View File

@@ -510,7 +510,7 @@ void ShowDropDownList(Window *w, DropDownList &&list, int selected, int button,
* @param button Button widget number of the parent window \a w that wants the dropdown menu. * @param button Button widget number of the parent window \a w that wants the dropdown menu.
* @param disabled_mask Bitmask for disabled items (items with their bit set are displayed, but not selectable in the dropdown list). * @param disabled_mask Bitmask for disabled items (items with their bit set are displayed, but not selectable in the dropdown list).
* @param hidden_mask Bitmask for hidden items (items with their bit set are not copied to the dropdown list). * @param hidden_mask Bitmask for hidden items (items with their bit set are not copied to the dropdown list).
* @param width Width of the dropdown menu. If \c 0, use the width of parent widget \a button. * @param width Width of the dropdown menu. If \c 0, use the width of parent widget \a button. If \c UINT_MAX, use the width of parent widget \a button, and use auto_width.
*/ */
void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask, uint32 hidden_mask, uint width, DropDownSyncFocus sync_parent_focus) void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask, uint32 hidden_mask, uint width, DropDownSyncFocus sync_parent_focus)
{ {
@@ -522,7 +522,13 @@ void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int butt
} }
} }
if (!list.empty()) ShowDropDownList(w, std::move(list), selected, button, width, false, false, sync_parent_focus); bool auto_width = false;
if (width == UINT_MAX) {
width = 0;
auto_width = true;
}
if (!list.empty()) ShowDropDownList(w, std::move(list), selected, button, width, auto_width, false, sync_parent_focus);
} }
/** /**