diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 9fbdc5e3de..704c6af43c 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -148,7 +148,7 @@ validate_global_widx(WC_EDITOR_OBJECT_SELECTION, WIDX_TAB_1); static bool _window_editor_object_selection_widgets_initialised; static std::vector _window_editor_object_selection_widgets = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 0, 43}, {600, 357}, WindowWidgetType::Resize, WindowColour::Secondary ), + MakeWidget({ 0, 43}, {WW, 357}, WindowWidgetType::Resize, WindowColour::Secondary ), MakeWidget({470, 22}, {122, 14}, WindowWidgetType::Button, WindowColour::Primary, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP), MakeWidget({ 4, 60}, {288, 327}, WindowWidgetType::Scroll, WindowColour::Secondary, SCROLL_VERTICAL ), MakeWidget({391, 45}, {114, 115}, WindowWidgetType::FlatBtn, WindowColour::Secondary ), @@ -384,7 +384,7 @@ rct_window* window_editor_object_selection_open() reset_selected_object_count_and_size(); window = WindowCreateCentred( - 600, 400, &window_editor_object_selection_events, WC_EDITOR_OBJECT_SELECTION, WF_10 | WF_RESIZABLE); + WW, WH, &window_editor_object_selection_events, WC_EDITOR_OBJECT_SELECTION, WF_10 | WF_RESIZABLE); window->widgets = _window_editor_object_selection_widgets.data(); window->widgets[WIDX_FILTER_TEXT_BOX].string = _filter_string; @@ -404,8 +404,8 @@ rct_window* window_editor_object_selection_open() window->selected_tab = 0; window->selected_list_item = -1; window->object_entry = nullptr; - window->min_width = 600; - window->min_height = 400; + window->min_width = WW; + window->min_height = WH; window->max_width = 1200; window->max_height = 1000; @@ -566,7 +566,7 @@ static void window_editor_object_selection_mouseup(rct_window* w, rct_widgetinde static void window_editor_object_selection_resize(rct_window* w) { - window_set_resize(w, 600, 400, 1200, 1000); + window_set_resize(w, WW, WH, 1200, 1000); } void window_editor_object_selection_mousedown(rct_window* w, rct_widgetindex widgetIndex, rct_widget* widget) @@ -886,8 +886,8 @@ static void window_editor_object_selection_invalidate(rct_window* w) } w->widgets[WIDX_FILTER_DROPDOWN].type = WindowWidgetType::Button; - w->widgets[WIDX_LIST].right = w->width - (600 - 587) - x; - w->widgets[WIDX_PREVIEW].left = w->width - (600 - 537) - (x / 2); + w->widgets[WIDX_LIST].right = w->width - (WW - 587) - x; + w->widgets[WIDX_PREVIEW].left = w->width - (WW - 537) - (x / 2); w->widgets[WIDX_PREVIEW].right = w->widgets[WIDX_PREVIEW].left + 113; w->widgets[WIDX_FILTER_RIDE_TAB_FRAME].right = w->widgets[WIDX_LIST].right;