diff --git a/CMakeLists.txt b/CMakeLists.txt index 01222b2b5f..d931cc5869 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,6 @@ option(ENABLE_LIGHTFX "Enable lighting effects." ON) option(ENABLE_SCRIPTING "Enable script / plugin support." ON) option(DISABLE_GUI "Don't build GUI. (Headless only.)") -option(LEFT_CLOSEBOX "Place window close button on the left.") if (FORCE32) set(TARGET_M "-m32") @@ -126,9 +125,6 @@ endif () if (ENABLE_SCRIPTING) add_definitions(-DENABLE_SCRIPTING) endif () -if (LEFT_CLOSEBOX) - add_definitions(-DLEFT_CLOSEBOX) -endif () if (NOT DISABLE_DISCORD_RPC) if(EXISTS "${ROOT_DIR}/discord-rpc") diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 4e2ce3775d..ff286e3d7e 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -504,10 +504,8 @@ static void window_editor_inventions_list_invalidate(rct_window* w) w->widgets[WIDX_BACKGROUND].right = w->width - 1; w->widgets[WIDX_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; w->widgets[WIDX_RESIZE].right = w->width - 1; w->widgets[WIDX_RESIZE].bottom = w->height - 1; diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index f11b855b89..f2d9916300 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -799,10 +799,8 @@ static void window_editor_object_selection_invalidate(rct_window* w) w->widgets[WIDX_BACKGROUND].right = w->width - 1; w->widgets[WIDX_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; w->widgets[WIDX_TAB_CONTENT_PANEL].right = w->width - 1; w->widgets[WIDX_TAB_CONTENT_PANEL].bottom = w->height - 1; w->widgets[WIDX_ADVANCED].left = w->width - 130; diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 8e0878014c..c94c369231 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -288,10 +288,8 @@ static void window_editor_objective_options_anchor_border_widgets(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; } static void window_editor_objective_options_draw_tab_images(rct_window* w, rct_drawpixelinfo* dpi) diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 809161ff20..7fc82e3c15 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -421,10 +421,8 @@ static void window_editor_scenario_options_anchor_border_widgets(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; } /** diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 72bb334c4b..3f554e272a 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -655,10 +655,8 @@ static void window_finances_summary_invalidate(rct_window* w) _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_TITLE].right = 528; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_BACKGROUND].bottom = 310; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_BACKGROUND].right = 529; - #ifndef LEFT_CLOSEBOX - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_CLOSE].left = 517; - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_CLOSE].right = 527; - #endif + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_CLOSE].left = 517; + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_SUMMARY][WIDX_CLOSE].right = 527; } /** @@ -832,10 +830,8 @@ static void window_finances_financial_graph_invalidate(rct_window* w) _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_TITLE].right = 528; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_BACKGROUND].bottom = 257; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_BACKGROUND].right = 529; - #ifndef LEFT_CLOSEBOX - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_CLOSE].left = 517; - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_CLOSE].right = 527; - #endif + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_CLOSE].left = 517; + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_FINANCIAL_GRAPH][WIDX_CLOSE].right = 527; } /** @@ -948,10 +944,8 @@ static void window_finances_park_value_graph_invalidate(rct_window* w) window_finances_set_pressed_tab(w); _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_TITLE].text = STR_PARK_VALUE_GRAPH; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_TITLE].right = 528; - #ifndef LEFT_CLOSEBOX - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_CLOSE].left = 517; - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_CLOSE].right = 527; - #endif + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_CLOSE].left = 517; + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_VALUE_GRAPH][WIDX_CLOSE].right = 527; } /** @@ -1058,10 +1052,8 @@ static void window_finances_profit_graph_invalidate(rct_window* w) _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_TITLE].right = 528; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_BACKGROUND].bottom = 257; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_BACKGROUND].right = 529; - #ifndef LEFT_CLOSEBOX - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_CLOSE].left = 517; - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_CLOSE].right = 527; - #endif + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_CLOSE].left = 517; + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_PROFIT_GRAPH][WIDX_CLOSE].right = 527; } /** @@ -1199,10 +1191,8 @@ static void window_finances_marketing_invalidate(rct_window* w) _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_TITLE].right = 528; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_BACKGROUND].bottom = 257; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_BACKGROUND].right = 529; - #ifndef LEFT_CLOSEBOX - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_CLOSE].left = 517; - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_CLOSE].right = 527; - #endif + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_CLOSE].left = 517; + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_MARKETING][WIDX_CLOSE].right = 527; } /** @@ -1392,10 +1382,8 @@ static void window_finances_research_invalidate(rct_window* w) _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_TITLE].right = 318; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_BACKGROUND].bottom = 206; _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_BACKGROUND].right = 319; - #ifndef LEFT_CLOSEBOX - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_CLOSE].left = 307; - _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_CLOSE].right = 317; - #endif + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_CLOSE].left = 307; + _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH][WIDX_CLOSE].right = 317; if (w->widgets != _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH]) { w->widgets = _windowFinancesPageWidgets[WINDOW_FINANCES_PAGE_RESEARCH]; diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 762123b12e..a75b4f8d0c 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -591,10 +591,8 @@ static void window_guest_common_invalidate(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_7); } diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index d631c9c6b8..327fd60a1b 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -644,10 +644,8 @@ static void window_guest_list_invalidate(rct_window* w) window_guest_list_widgets[WIDX_TAB_CONTENT_PANEL].right = w->width - 1; window_guest_list_widgets[WIDX_TAB_CONTENT_PANEL].bottom = w->height - 1; window_guest_list_widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - window_guest_list_widgets[WIDX_CLOSE].left = w->width - 13; - window_guest_list_widgets[WIDX_CLOSE].right = w->width - 3; - #endif + window_guest_list_widgets[WIDX_CLOSE].left = w->width - 13; + window_guest_list_widgets[WIDX_CLOSE].right = w->width - 3; window_guest_list_widgets[WIDX_GUEST_LIST].right = w->width - 4; window_guest_list_widgets[WIDX_GUEST_LIST].bottom = w->height - 15; window_guest_list_widgets[WIDX_MAP].left = 273 - 350 + w->width; diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index cef51d8257..48ce0d4ce4 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -674,11 +674,10 @@ static void window_loadsave_compute_max_date_width() static void window_loadsave_invalidate(rct_window* w) { window_loadsave_widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - // close button has to move if it's on the right side - window_loadsave_widgets[WIDX_CLOSE].left = w->width - 13; - window_loadsave_widgets[WIDX_CLOSE].right = w->width - 3; - #endif + // close button has to move if it's on the right side + window_loadsave_widgets[WIDX_CLOSE].left = w->width - 13; + window_loadsave_widgets[WIDX_CLOSE].right = w->width - 3; + window_loadsave_widgets[WIDX_BACKGROUND].right = w->width - 1; window_loadsave_widgets[WIDX_BACKGROUND].bottom = w->height - 1; window_loadsave_widgets[WIDX_RESIZE].top = w->height - 1; @@ -1144,14 +1143,11 @@ enum WIDX_OVERWRITE_CANCEL }; -#ifndef LEFT_CLOSEBOX - // close button on right of window - #define OVERWRITE_WINDOW_SKELETON \ - { WWT_CLOSEBOX, 0, OVERWRITE_WW - 13, OVERWRITE_WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP } -#else - #define OVERWRITE_WINDOW_SKELETON \ - { WWT_CLOSEBOX, 0, 2, 12, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP } -#endif +// close button on right of window +#define OVERWRITE_WINDOW_SKELETON \ + { \ + WWT_CLOSEBOX, 0, OVERWRITE_WW - 13, OVERWRITE_WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP \ + } static rct_widget window_overwrite_prompt_widgets[] = { { WWT_FRAME, 0, 0, OVERWRITE_WW - 1, 0, OVERWRITE_WH - 1, STR_NONE, STR_NONE }, diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index bd13546fb1..1ba282fb90 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -712,10 +712,8 @@ static void window_map_invalidate(rct_window* w) w->widgets[WIDX_RESIZE].right = w->width - 1; w->widgets[WIDX_RESIZE].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 2 - 11; - w->widgets[WIDX_CLOSE].right = w->width - 2 - 11 + 10; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 2 - 11; + w->widgets[WIDX_CLOSE].right = w->width - 2 - 11 + 10; w->widgets[WIDX_MAP].right = w->width - 4; if ((gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) || gCheatsSandboxMode) diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index cfaa00757e..01a398305a 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -641,10 +641,8 @@ static void window_new_ride_refresh_widget_sizing(rct_window* w) window_new_ride_widgets[WIDX_PAGE_BACKGROUND].right = width - 1; window_new_ride_widgets[WIDX_PAGE_BACKGROUND].bottom = height - 1; window_new_ride_widgets[WIDX_TITLE].right = width - 2; - #ifndef LEFT_CLOSEBOX - window_new_ride_widgets[WIDX_CLOSE].left = width - 13; - window_new_ride_widgets[WIDX_CLOSE].right = width - 3; - #endif + window_new_ride_widgets[WIDX_CLOSE].left = width - 13; + window_new_ride_widgets[WIDX_CLOSE].right = width - 3; w->width = width; w->height = height; diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 94b46c3a90..764521c60e 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -1801,10 +1801,8 @@ static void window_park_anchor_border_widgets(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; } static void window_park_set_pressed_tab(rct_window* w) diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 8053c6806e..68a0ee3832 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -324,10 +324,8 @@ static void window_research_development_invalidate(rct_window* w) window_research_development_widgets[WIDX_TITLE].right = 298; window_research_development_widgets[WIDX_BACKGROUND].right = 299; window_research_development_widgets[WIDX_BACKGROUND].bottom = 195; - #ifndef LEFT_CLOSEBOX - window_research_development_widgets[WIDX_CLOSE].left = 287; - window_research_development_widgets[WIDX_CLOSE].right = 297; - #endif + window_research_development_widgets[WIDX_CLOSE].left = 287; + window_research_development_widgets[WIDX_CLOSE].right = 297; } /** @@ -563,10 +561,8 @@ static void window_research_funding_invalidate(rct_window* w) window_research_funding_widgets[WIDX_TITLE].right = 318; window_research_funding_widgets[WIDX_BACKGROUND].right = 319; window_research_funding_widgets[WIDX_BACKGROUND].bottom = 206; - #ifndef LEFT_CLOSEBOX - window_research_funding_widgets[WIDX_CLOSE].left = 307; - window_research_funding_widgets[WIDX_CLOSE].right = 317; - #endif + window_research_funding_widgets[WIDX_CLOSE].left = 307; + window_research_funding_widgets[WIDX_CLOSE].right = 317; } /** diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index e6a8ff27c3..87d171afb8 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1844,10 +1844,8 @@ static void window_ride_anchor_border_widgets(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; } #pragma region Main diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 9c51a85685..99e9f8b75b 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -512,11 +512,11 @@ static void window_ride_list_invalidate(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - // if close buttton is on the right then it must move - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + + // if close buttton is on the right then it must move + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; + w->widgets[WIDX_LIST].right = w->width - 26; w->widgets[WIDX_LIST].bottom = w->height - 15; w->widgets[WIDX_OPEN_CLOSE_ALL].right = w->width - 2; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index c14d37a6ca..f826a1ff89 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -452,8 +452,7 @@ rct_window* window_scenery_open() window_scenery_init(); window = window_create( - ScreenCoordsXY(context_get_width() - WW, 0x1D), WW, WH, - &window_scenery_events, WC_SCENERY, WF_NO_SCROLLING); + ScreenCoordsXY(context_get_width() - WW, 0x1D), WW, WH, &window_scenery_events, WC_SCENERY, WF_NO_SCROLLING); window->widgets = window_scenery_widgets; window->enabled_widgets = (1 << WIDX_SCENERY_CLOSE) | (1 << WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) | (1 << WIDX_SCENERY_TAB_1) @@ -1089,10 +1088,8 @@ void window_scenery_invalidate(rct_window* w) window_scenery_widgets[WIDX_SCENERY_TAB_CONTENT_PANEL].right = w->width - 1; window_scenery_widgets[WIDX_SCENERY_TAB_CONTENT_PANEL].bottom = w->height - 1; window_scenery_widgets[WIDX_SCENERY_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - window_scenery_widgets[WIDX_SCENERY_CLOSE].left = w->width - 13; - window_scenery_widgets[WIDX_SCENERY_CLOSE].right = window_scenery_widgets[WIDX_SCENERY_CLOSE].left + 10; - #endif + window_scenery_widgets[WIDX_SCENERY_CLOSE].left = w->width - 13; + window_scenery_widgets[WIDX_SCENERY_CLOSE].right = window_scenery_widgets[WIDX_SCENERY_CLOSE].left + 10; window_scenery_widgets[WIDX_SCENERY_LIST].right = w->width - 26; window_scenery_widgets[WIDX_SCENERY_LIST].bottom = w->height - 14; diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index cdda270627..cdf6145b57 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -261,10 +261,8 @@ static void window_shortcut_invalidate(rct_window* w) window_shortcut_widgets[WIDX_BACKGROUND].right = w->width - 1; window_shortcut_widgets[WIDX_BACKGROUND].bottom = w->height - 1; window_shortcut_widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - window_shortcut_widgets[WIDX_CLOSE].right = w->width - 3; - window_shortcut_widgets[WIDX_CLOSE].left = w->width - 13; - #endif + window_shortcut_widgets[WIDX_CLOSE].right = w->width - 3; + window_shortcut_widgets[WIDX_CLOSE].left = w->width - 13; window_shortcut_widgets[WIDX_SCROLL].right = w->width - 5; window_shortcut_widgets[WIDX_SCROLL].bottom = w->height - 18; window_shortcut_widgets[WIDX_RESET].top = w->height - 15; diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index be8c03c593..f1b15a0d37 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -788,10 +788,8 @@ void window_staff_stats_invalidate(rct_window* w) window_staff_stats_widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - window_staff_stats_widgets[WIDX_CLOSE].left = w->width - 13; - window_staff_stats_widgets[WIDX_CLOSE].right = w->width - 3; - #endif + window_staff_stats_widgets[WIDX_CLOSE].left = w->width - 13; + window_staff_stats_widgets[WIDX_CLOSE].right = w->width - 3; window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_3); } @@ -866,10 +864,8 @@ void window_staff_options_invalidate(rct_window* w) window_staff_options_widgets[WIDX_RESIZE].bottom = w->height - 1; window_staff_options_widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - window_staff_options_widgets[WIDX_CLOSE].left = w->width - 13; - window_staff_options_widgets[WIDX_CLOSE].right = w->width - 3; - #endif + window_staff_options_widgets[WIDX_CLOSE].left = w->width - 13; + window_staff_options_widgets[WIDX_CLOSE].right = w->width - 3; window_align_tabs(w, WIDX_TAB_1, WIDX_TAB_3); } @@ -909,10 +905,8 @@ void window_staff_overview_invalidate(rct_window* w) window_staff_overview_widgets[WIDX_BTM_LABEL].top = w->height - 13; window_staff_overview_widgets[WIDX_BTM_LABEL].bottom = w->height - 3; - #ifndef LEFT_CLOSEBOX - window_staff_overview_widgets[WIDX_CLOSE].left = w->width - 13; - window_staff_overview_widgets[WIDX_CLOSE].right = w->width - 3; - #endif + window_staff_overview_widgets[WIDX_CLOSE].left = w->width - 13; + window_staff_overview_widgets[WIDX_CLOSE].right = w->width - 3; window_staff_overview_widgets[WIDX_PICKUP].left = w->width - 25; window_staff_overview_widgets[WIDX_PICKUP].right = w->width - 2; diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 07f650aaab..f2766a343b 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -543,10 +543,8 @@ void window_staff_list_invalidate(rct_window* w) window_staff_list_widgets[WIDX_STAFF_LIST_TAB_CONTENT_PANEL].right = w->width - 1; window_staff_list_widgets[WIDX_STAFF_LIST_TAB_CONTENT_PANEL].bottom = w->height - 1; window_staff_list_widgets[WIDX_STAFF_LIST_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - window_staff_list_widgets[WIDX_STAFF_LIST_CLOSE].left = w->width - 2 - 11; - window_staff_list_widgets[WIDX_STAFF_LIST_CLOSE].right = w->width - 2 - 11 + 10; - #endif + window_staff_list_widgets[WIDX_STAFF_LIST_CLOSE].left = w->width - 2 - 11; + window_staff_list_widgets[WIDX_STAFF_LIST_CLOSE].right = w->width - 2 - 11 + 10; window_staff_list_widgets[WIDX_STAFF_LIST_LIST].right = w->width - 4; window_staff_list_widgets[WIDX_STAFF_LIST_LIST].bottom = w->height - 15; window_staff_list_widgets[WIDX_STAFF_LIST_QUICK_FIRE].left = w->width - 77; diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp index 8ed665c67b..eb0af70225 100644 --- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp +++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp @@ -1,4 +1,4 @@ - /***************************************************************************** +/***************************************************************************** * Copyright (c) 2014-2019 OpenRCT2 developers * * For a complete list of all authors, please refer to contributors.md @@ -24,9 +24,9 @@ #include #include - static constexpr const rct_string_id WINDOW_TITLE = STR_SELECT_SCENARIO; - static constexpr const int32_t WW = 734; - static constexpr const int32_t WH = 334; +static constexpr const rct_string_id WINDOW_TITLE = STR_SELECT_SCENARIO; +static constexpr const int32_t WW = 734; +static constexpr const int32_t WH = 334; #define INITIAL_NUM_UNLOCKED_SCENARIOS 5 // clang-format off @@ -421,10 +421,8 @@ static void window_scenarioselect_invalidate(rct_window* w) int32_t windowWidth = w->width; window_scenarioselect_widgets[WIDX_BACKGROUND].right = windowWidth - 1; window_scenarioselect_widgets[WIDX_TITLEBAR].right = windowWidth - 2; - #ifndef LEFT_CLOSEBOX - window_scenarioselect_widgets[WIDX_CLOSE].left = windowWidth - 13; - window_scenarioselect_widgets[WIDX_CLOSE].right = windowWidth - 3; - #endif + window_scenarioselect_widgets[WIDX_CLOSE].left = windowWidth - 13; + window_scenarioselect_widgets[WIDX_CLOSE].right = windowWidth - 3; window_scenarioselect_widgets[WIDX_TABCONTENT].right = windowWidth - 1; window_scenarioselect_widgets[WIDX_SCENARIOLIST].right = windowWidth - 179; diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index a8789e7b52..32fc4a0fd8 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -117,10 +117,8 @@ static void window_viewport_anchor_border_widgets(rct_window* w) w->widgets[WIDX_PAGE_BACKGROUND].right = w->width - 1; w->widgets[WIDX_PAGE_BACKGROUND].bottom = w->height - 1; w->widgets[WIDX_TITLE].right = w->width - 2; - #ifndef LEFT_CLOSEBOX - w->widgets[WIDX_CLOSE].left = w->width - 13; - w->widgets[WIDX_CLOSE].right = w->width - 3; - #endif + w->widgets[WIDX_CLOSE].left = w->width - 13; + w->widgets[WIDX_CLOSE].right = w->width - 3; } static void window_viewport_mouseup(rct_window* w, rct_widgetindex widgetIndex) diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index b590e484a4..c1b67ad152 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -196,17 +196,9 @@ void window_tooltip_close(); rct_window* window_scenery_scatter_open(); // clang-format off -#ifndef LEFT_CLOSEBOX - // close button on right of window - #define WINDOW_SKELETON(TITLE, WIDTH, HEIGHT) \ - WWT_FRAME, 0, 0, WIDTH - 1, 0, HEIGHT, 0xFFFFFFFF, STR_NONE }, \ - { WWT_CAPTION, 0, 1, WIDTH - 2, 1, 14, TITLE, STR_WINDOW_TITLE_TIP }, \ - { WWT_CLOSEBOX, 0, WIDTH - 13, WIDTH - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP -#else - // close button on left of window - #define WINDOW_SKELETON(TITLE, WIDTH, HEIGHT) \ - WWT_FRAME, 0, 0, WIDTH - 1, 0, HEIGHT, 0xFFFFFFFF, STR_NONE }, \ - { WWT_CAPTION, 0, 13, WIDTH - 2, 1, 14, TITLE, STR_WINDOW_TITLE_TIP }, \ - { WWT_CLOSEBOX, 0, 2, 12, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP -#endif +// close button on right of window +#define WINDOW_SKELETON(TITLE, WIDTH, HEIGHT) \ + WWT_FRAME, 0, 0, WIDTH - 1, 0, HEIGHT, 0xFFFFFFFF, STR_NONE }, \ + { WWT_CAPTION, 0, 1, WIDTH - 2, 1, 14, TITLE, STR_WINDOW_TITLE_TIP }, \ + { WWT_CLOSEBOX, 0, WIDTH - 13, WIDTH - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP // clang-format on