From 81e3181ebbbc63c337a55bf4f43d3009058f2c8a Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 10 Jun 2025 22:27:50 +0200 Subject: [PATCH] Pass ScreenSize to makeWindowShim() --- src/openrct2-ui/interface/Widget.h | 8 ++++---- src/openrct2-ui/scripting/CustomWindow.cpp | 2 +- src/openrct2-ui/windows/About.cpp | 2 +- src/openrct2-ui/windows/AssetPacks.cpp | 2 +- src/openrct2-ui/windows/Banner.cpp | 2 +- src/openrct2-ui/windows/Changelog.cpp | 2 +- src/openrct2-ui/windows/Cheats.cpp | 2 +- src/openrct2-ui/windows/ClearScenery.cpp | 2 +- src/openrct2-ui/windows/CustomCurrency.cpp | 2 +- src/openrct2-ui/windows/DemolishRidePrompt.cpp | 2 +- src/openrct2-ui/windows/EditorInventionsList.cpp | 2 +- src/openrct2-ui/windows/EditorObjectSelection.cpp | 2 +- src/openrct2-ui/windows/EditorParkEntrance.cpp | 2 +- src/openrct2-ui/windows/EditorScenarioOptions.cpp | 2 +- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/GuestList.cpp | 2 +- src/openrct2-ui/windows/InstallTrack.cpp | 2 +- src/openrct2-ui/windows/Land.cpp | 2 +- src/openrct2-ui/windows/LandRights.cpp | 2 +- src/openrct2-ui/windows/LoadSave.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/MapGen.cpp | 2 +- src/openrct2-ui/windows/MazeConstruction.cpp | 2 +- src/openrct2-ui/windows/Multiplayer.cpp | 2 +- src/openrct2-ui/windows/NetworkStatus.cpp | 2 +- src/openrct2-ui/windows/NewCampaign.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/News.cpp | 2 +- src/openrct2-ui/windows/ObjectLoadError.cpp | 2 +- src/openrct2-ui/windows/Options.cpp | 2 +- src/openrct2-ui/windows/OverwritePrompt.cpp | 2 +- src/openrct2-ui/windows/Park.cpp | 2 +- src/openrct2-ui/windows/PatrolArea.cpp | 2 +- src/openrct2-ui/windows/Player.cpp | 2 +- src/openrct2-ui/windows/ProgressWindow.cpp | 2 +- src/openrct2-ui/windows/RefurbishRidePrompt.cpp | 2 +- src/openrct2-ui/windows/Research.cpp | 4 ++-- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/RideList.cpp | 2 +- src/openrct2-ui/windows/SavePrompt.cpp | 4 ++-- src/openrct2-ui/windows/ScenarioSelect.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/SceneryScatter.cpp | 2 +- src/openrct2-ui/windows/ServerList.cpp | 2 +- src/openrct2-ui/windows/ServerStart.cpp | 2 +- src/openrct2-ui/windows/ShortcutKeys.cpp | 6 +++--- src/openrct2-ui/windows/Sign.cpp | 2 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffFirePrompt.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- src/openrct2-ui/windows/TextInput.cpp | 2 +- src/openrct2-ui/windows/Themes.cpp | 2 +- src/openrct2-ui/windows/TileInspector.cpp | 2 +- src/openrct2-ui/windows/TrackDesignManage.cpp | 4 ++-- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- src/openrct2-ui/windows/TrackList.cpp | 2 +- src/openrct2-ui/windows/Transparency.cpp | 2 +- src/openrct2-ui/windows/ViewClipping.cpp | 2 +- src/openrct2-ui/windows/Viewport.cpp | 2 +- src/openrct2-ui/windows/Water.cpp | 2 +- 63 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/openrct2-ui/interface/Widget.h b/src/openrct2-ui/interface/Widget.h index ff2670bb18..b2c369bad3 100644 --- a/src/openrct2-ui/interface/Widget.h +++ b/src/openrct2-ui/interface/Widget.h @@ -172,13 +172,13 @@ namespace OpenRCT2::Ui return res; } - constexpr std::array makeWindowShim(StringId title, int16_t width, int16_t height) + constexpr std::array makeWindowShim(StringId title, ScreenSize size) { // clang-format off std::array out = { - makeWidget({ 0, 0 }, { width, height }, WidgetType::frame, WindowColour::primary), - makeWidget({ 1, 1 }, { width - 1, kTitleHeightNormal }, WidgetType::caption, WindowColour::primary, title, STR_WINDOW_TITLE_TIP), - makeWidget({ width - 12, 2 }, { 11, 11 }, WidgetType::closeBox, WindowColour::primary, kWidgetContentEmpty, STR_CLOSE_WINDOW_TIP), + makeWidget({ 0, 0 }, { size.width, size.height }, WidgetType::frame, WindowColour::primary), + makeWidget({ 1, 1 }, { size.width - 1, kTitleHeightNormal }, WidgetType::caption, WindowColour::primary, title, STR_WINDOW_TITLE_TIP), + makeWidget({ size.width - 12, 2 }, { 11, 11 }, WidgetType::closeBox, WindowColour::primary, kWidgetContentEmpty, STR_CLOSE_WINDOW_TIP), }; // clang-format on diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index b8be4b24e5..7d42bd47ad 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -46,7 +46,7 @@ namespace OpenRCT2::Ui::Windows }; static auto CustomDefaultWidgets = makeWidgets( - makeWindowShim(STR_STRING, 50, 50), + makeWindowShim(STR_STRING, { 50, 50 }), makeWidget({ 0, 14 }, { 50, 36 }, WidgetType::resize, WindowColour::secondary) // content panel ); diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index 744e623862..62d777ea38 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -59,7 +59,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr auto kMainWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, TABHEIGHT }, { WW, WH - TABHEIGHT }, WidgetType::frame, WindowColour::secondary), makeRemapWidget({ 3, 17 }, { 91, TABHEIGHT - 16 }, WidgetType::tab, WindowColour::secondary, SPR_TAB_LARGE), makeRemapWidget({ 94, 17 }, { 91, TABHEIGHT - 16 }, WidgetType::tab, WindowColour::secondary, SPR_TAB_LARGE)); diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp index 15d1a5cb1a..2619ee95ce 100644 --- a/src/openrct2-ui/windows/AssetPacks.cpp +++ b/src/openrct2-ui/windows/AssetPacks.cpp @@ -42,7 +42,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto WindowAssetPacksWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 0 }, { 0, 0 }, WidgetType::labelCentred, WindowColour::secondary, STR_HIGH_PRIORITY), makeWidget({ 0, 0 }, { 0, 147 }, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL), makeWidget({ 0, 0 }, { 0, 0 }, WidgetType::labelCentred, WindowColour::secondary, STR_LOW_PRIORITY), diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index d3418e8712..8fb6ce9cc1 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -66,7 +66,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr auto window_banner_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 3, 17}, {85, 60}, WidgetType::viewport, WindowColour::secondary, 0x0FFFFFFFE ), // tab content panel makeWidget({WW - 25, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_CHANGE_BANNER_TEXT_TIP ), // change banner button makeWidget({WW - 25, 43}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_NO_ENTRY), STR_SET_AS_NO_ENTRY_BANNER_TIP ), // no entry button diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 5d74475e5f..7983474573 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -43,7 +43,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _windowChangelogWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({0, 14}, {500, 382}, WidgetType::resize, WindowColour::secondary ), // content panel makeWidget({3, 16}, {495, 366}, WidgetType::scroll, WindowColour::secondary, SCROLL_BOTH ), // scroll area makeWidget({3, 473}, {300, 14}, WidgetType::placeholder, WindowColour::secondary, STR_NEW_RELEASE_DOWNLOAD_PAGE) // changelog button diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 5001e59c7e..a04e060a55 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -210,7 +210,7 @@ static constexpr int32_t kTabStart = 3; #pragma endregion static constexpr auto kMainCheatWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43}, {WW, 257}, WidgetType::resize, WindowColour::secondary), /* tab content panel */ makeTab ({ 3, 17}, STR_FINANCIAL_CHEATS_TIP ), /* tab 1 */ makeTab ({ 34, 17}, STR_DATE_CHEATS_TIP ), /* tab 2 */ diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 15d19a5625..22e427eb0a 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -45,7 +45,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_clear_scenery_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({ 27, 17 }, { 44, 32 }, WidgetType::imgBtn, WindowColour::primary, SPR_LAND_TOOL_SIZE_0, kStringIdNone ), // preview box makeRemapWidget({ 28, 18 }, { 16, 16 }, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size makeRemapWidget({ 54, 32 }, { 16, 16 }, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index e52448a886..bc487c3bc9 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -41,7 +41,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_custom_currency_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeSpinnerWidgets({100, 30}, {101, 11}, WidgetType::spinner, WindowColour::secondary, STR_CURRENCY_FORMAT), // NB: 3 widgets makeWidget ({120, 50}, { 81, 11}, WidgetType::button, WindowColour::secondary, kStringIdEmpty ), makeWidget ({220, 50}, {131, 11}, WidgetType::dropdownMenu, WindowColour::secondary ), diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index b0d3c128c6..ccc3b1645e 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -34,7 +34,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_ride_demolish_widgets = makeWidgets( - makeWindowShim(STR_DEMOLISH_RIDE, WW, WH), + makeWindowShim(STR_DEMOLISH_RIDE, { WW, WH }), makeWidget({ 10, WH - 22}, {85, 14}, WidgetType::button, WindowColour::primary, STR_DEMOLISH ), makeWidget({WW - 95, WH - 22}, {85, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 5b7380af56..68bf30a8fb 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -53,7 +53,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _inventionListWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43}, {600, 357}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17} ), makeWidget({ 4, 56}, {368, 161}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 9487470a60..ec40202411 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -218,7 +218,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _window_editor_object_selection_widgets = makeWidgets( - makeWindowShim (WINDOW_TITLE, WW, WH), + makeWindowShim (WINDOW_TITLE, { WW, WH }), makeWidget ({ 0, 43}, {WW, 357}, WidgetType::resize, WindowColour::secondary ), makeWidget ({ 4, 60}, {288, 277}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), makeWidget ({391, 45}, {114, 114}, WidgetType::flatBtn, WindowColour::secondary ), diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index 718fe40051..1ee988ff13 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -59,7 +59,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _widgets = makeWidgets( - makeWindowShim(kWindowTitle, kWindowWidth, kWindowHeight), + makeWindowShim(kWindowTitle, { kWindowWidth, kWindowHeight }), makeWidget ({ 0, 43 }, { kWindowWidth, kWindowHeight - 43 }, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17 }, kStringIdNone ), makeWidget ({ 2, 45 }, { kScrollWidth, kScrollHeight }, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index b757940430..1c17049fba 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -201,7 +201,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto makeOptionsWidgets = [](StringId title, ScreenSize size) { return makeWidgets( - makeWindowShim(title, size.width, size.height), + makeWindowShim(title, size), makeWidget({ 0, 43}, { size.width, 106 }, WidgetType::resize, WindowColour::secondary), makeTab ({ 3, 17}, STR_SCENARIO_OPTIONS_OBJECTIVE_TIP ), makeTab ({ 34, 17}, STR_SCENARIO_OPTIONS_SCENARIO_DETAILS_TIP ), diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index f2f88967bb..b125f305e4 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -100,7 +100,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto makeFinancesWidgets = [](StringId title, ScreenSize resizeSize, ScreenSize frameSize) { return makeWidgets( - makeWindowShim(title, frameSize.width, frameSize.height), + makeWindowShim(title, frameSize), makeWidget({ 0, 43 }, resizeSize, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_FINANCES_SHOW_SUMMARY_TAB_TIP), makeTab({ 34, 17 }, STR_FINANCES_SHOW_CASH_TAB_TIP), diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 0ada0e4416..aff869b4f4 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -124,7 +124,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_footpath_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW_WINDOW, WH_WINDOW), + makeWindowShim(WINDOW_TITLE, { WW_WINDOW, WH_WINDOW }), // Type group makeWidget({ 3, 17}, {100, 95}, WidgetType::groupbox, WindowColour::primary , STR_TYPE ), diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index dd3e5e9455..64db7cc6e0 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -113,7 +113,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kMainGuestWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), \ + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43 }, { 192, 114 }, WidgetType::resize, WindowColour::secondary), /* Resize */ makeTab({ 3, 17 }, STR_SHOW_GUEST_VIEW_TIP), /* Tab 1 */ makeTab({ 34, 17 }, STR_SHOW_GUEST_NEEDS_TIP), /* Tab 2 */ diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index d549932d92..2a406dcecc 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -58,7 +58,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_guest_list_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43}, {350, 287}, WidgetType::resize, WindowColour::secondary ), // tab content panel makeWidget({ 5, 59}, { 80, 12}, WidgetType::dropdownMenu, WindowColour::secondary, STR_ARG_4_PAGE_X ), // page dropdown makeWidget({ 73, 60}, { 11, 10}, WidgetType::button, WindowColour::secondary, STR_DROPDOWN_GLYPH ), // page dropdown button diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 2fc448747f..957aecbf61 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -52,7 +52,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_install_track_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 4, 18}, {372, 219}, WidgetType::flatBtn, WindowColour::primary ), makeWidget({PREVIEW_BUTTONS_LEFT, 422}, { 22, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), makeWidget({PREVIEW_BUTTONS_LEFT, 398}, { 22, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_SCENERY), STR_TOGGLE_SCENERY_TIP), diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index d018ead75c..1d9b4f0e3d 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -53,7 +53,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_land_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({19, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RIDE_CONSTRUCTION_SLOPE_UP), STR_ENABLE_MOUNTAIN_TOOL_TIP), // mountain mode makeWidget ({55, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_PAINTBRUSH), STR_DISABLE_ELEVATION), // paint mode makeWidget ({27, 48}, {44, 32}, WidgetType::imgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0), kStringIdNone), // preview box diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 48b1a91115..def621bc26 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -59,7 +59,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_land_rights_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({ 27, 17}, { 44, 32}, WidgetType::imgBtn, WindowColour::primary, ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box makeRemapWidget({ 28, 18}, { 16, 16}, WidgetType::trnBtn, WindowColour::primary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_RIGHTS_TIP ), // decrement size makeRemapWidget({ 54, 32}, { 16, 16}, WidgetType::trnBtn, WindowColour::primary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP ), // increment size diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index ac5da60d51..c5dfbbbb0f 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -101,7 +101,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_loadsave_widgets = makeWidgets( - makeWindowShim(kStringIdNone, WW, WH), + makeWindowShim(kStringIdNone, { WW, WH }), makeWidget({ 0, 15 }, { WW, WH - 15 }, WidgetType::resize, WindowColour::secondary ), // WIDX_RESIZE makeWidget({ WW - 100 - 4, 20 }, { 20, 20 }, WidgetType::flatBtn, WindowColour::primary, SPR_G2_FOLDER_PARENT, STR_PARENT_FOLDER_TIP ), // WIDX_PARENT_FOLDER makeWidget({ WW - 50 - 4, 20 }, { 20, 20 }, WidgetType::flatBtn, WindowColour::primary, SPR_G2_FOLDER_NEW, STR_FILEBROWSER_ACTION_NEW_FOLDER), // WIDX_NEW_FOLDER diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 68fd9b05e2..b2c931a5a2 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -132,7 +132,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_map_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({ 0, 43}, {245, 215}, WidgetType::resize, WindowColour::secondary ), makeRemapWidget ({ 3, 17}, { 31, 27}, WidgetType::colourBtn, WindowColour::secondary, SPR_TAB, STR_SHOW_PEOPLE_ON_MAP_TIP ), makeRemapWidget ({ 34, 17}, { 31, 27}, WidgetType::colourBtn, WindowColour::secondary, SPR_TAB, STR_SHOW_RIDES_STALLS_ON_MAP_TIP), diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 528edd7551..6ca9b3e2a0 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -117,7 +117,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto makeMapGenWidgets = [](StringId title) { return makeWidgets( - makeWindowShim(title, kWindowSize.width, kWindowSize.height), + makeWindowShim(title, kWindowSize), makeWidget({ 0, 43 }, { kWindowSize.width, 177 }, WidgetType::resize, WindowColour::secondary), makeTab ({ 3, 17 }), makeTab ({ 34, 17 }), diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index e9c226626f..b63c8869ed 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -61,7 +61,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_maze_construction_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 3, 17}, {160, 55}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_MODE ), makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), makeWidget({ 0, 0}, { 1, 1}, WidgetType::empty, WindowColour::primary ), diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 4f525b71a1..53195467f4 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -64,7 +64,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kMainMultiplayerWidgets = makeWidgets( - makeWindowShim(kStringIdNone, 340, 240), + makeWindowShim(kStringIdNone, { 340, 240 }), makeWidget({ 0, 43}, {340, 197}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP), makeTab ({ 34, 17}, STR_PLAYERS_TIP ), diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index e4ed351f9f..cfc1a66f25 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -26,7 +26,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_network_status_widgets = makeWidgets( - makeWindowShim(kStringIdEmpty, 320, 90) + makeWindowShim(kStringIdEmpty, { 320, 90 }) ); // clang-format on diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 625b94c6ce..38c961685e 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -49,7 +49,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_new_campaign_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({ 14, 24}, {126, 12}, WidgetType::label, WindowColour::primary, kStringIdEmpty ), // ride label makeWidget ({100, 24}, {242, 12}, WidgetType::dropdownMenu, WindowColour::primary, kStringIdEmpty ), // ride dropdown makeWidget ({330, 25}, { 11, 10}, WidgetType::button, WindowColour::primary, STR_DROPDOWN_GLYPH ), // ride dropdown button diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 2820aabe64..6fa79fc518 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -210,7 +210,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_new_ride_widgets = makeWidgets( - makeWindowShim(WindowTitle, WindowWidth, kWindowHeight), + makeWindowShim(WindowTitle, { WindowWidth, kWindowHeight }), makeWidget({ 0, 43}, {601, 339}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_TRANSPORT_RIDES_TIP ), makeTab ({ 34, 17}, STR_GENTLE_RIDES_TIP ), diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index a780132bd1..da9499d870 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -54,7 +54,7 @@ namespace OpenRCT2::Ui::Windows static constexpr auto makeNewsWidgets = [](StringId title) { return makeWidgets( - makeWindowShim(title, WW, WH), + makeWindowShim(title, { WW, WH }), makeWidget({ 0, 43 }, { WW, 257 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_RECENT_MESSAGES), makeTab({ 34, 17 }, STR_NOTIFICATION_SETTINGS) diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index e46985a117..c29f0ee4d7 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -281,7 +281,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_object_load_error_widgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ NAME_COL_LEFT, 57}, {108, 14}, WidgetType::tableHeader, WindowColour::primary, STR_OBJECT_NAME ), // 'Object name' header makeWidget({SOURCE_COL_LEFT, 57}, {166, 14}, WidgetType::tableHeader, WindowColour::primary, STR_OBJECT_SOURCE ), // 'Object source' header makeWidget({ TYPE_COL_LEFT, 57}, {166, 14}, WidgetType::tableHeader, WindowColour::primary, STR_OBJECT_TYPE ), // 'Object type' header diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index c3b4a51b5c..10c4b7fd64 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -256,7 +256,7 @@ namespace OpenRCT2::Ui::Windows static constexpr int32_t WH = 332; static constexpr auto kMainOptionsWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43 }, { WW, 289 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_OPTIONS_DISPLAY_TIP), makeTab({ 34, 17 }, STR_OPTIONS_RENDERING_TIP), diff --git a/src/openrct2-ui/windows/OverwritePrompt.cpp b/src/openrct2-ui/windows/OverwritePrompt.cpp index 1fdd781447..8aa2307fa1 100644 --- a/src/openrct2-ui/windows/OverwritePrompt.cpp +++ b/src/openrct2-ui/windows/OverwritePrompt.cpp @@ -33,7 +33,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_overwrite_prompt_widgets = makeWidgets( - makeWindowShim(STR_FILEBROWSER_OVERWRITE_TITLE, OVERWRITE_WW, OVERWRITE_WH), + makeWindowShim(STR_FILEBROWSER_OVERWRITE_TITLE, { OVERWRITE_WW, OVERWRITE_WH }), makeWidget({ 10, OVERWRITE_WH - 20 }, { 84, 11 }, WidgetType::button, WindowColour::primary, STR_FILEBROWSER_OVERWRITE_TITLE), makeWidget({ OVERWRITE_WW - 95, OVERWRITE_WH - 20 }, { 85, 11 }, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 218b59ef6a..7c61c4cb71 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -89,7 +89,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto makeParkWidgets = [](int16_t width) { return makeWidgets( - makeWindowShim(WINDOW_TITLE, width, WH), + makeWindowShim(WINDOW_TITLE, { width, WH }), makeWidget({ 0, 43 }, { width, 131 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_PARK_ENTRANCE_TAB_TIP), makeTab({ 34, 17 }, STR_PARK_RATING_TAB_TIP), diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp index 1fd8b1aef8..2124f024b0 100644 --- a/src/openrct2-ui/windows/PatrolArea.cpp +++ b/src/openrct2-ui/windows/PatrolArea.cpp @@ -45,7 +45,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto PatrolAreaWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({27, 17}, {44, 32}, WidgetType::imgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box makeRemapWidget({28, 18}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_PATROL_AREA_TIP), // decrement size makeRemapWidget({54, 32}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_PATROL_AREA_TIP ) // increment size diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index a596c9ddf9..7368a50390 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -51,7 +51,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kCommonPlayerWidgets = makeWidgets( - makeWindowShim(STR_STRING, 192, 157), + makeWindowShim(STR_STRING, { 192, 157 }), makeWidget({ 0, 43 }, { 192, 114 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }), makeTab({ 34, 17 }) diff --git a/src/openrct2-ui/windows/ProgressWindow.cpp b/src/openrct2-ui/windows/ProgressWindow.cpp index 0c80645523..86e373859e 100644 --- a/src/openrct2-ui/windows/ProgressWindow.cpp +++ b/src/openrct2-ui/windows/ProgressWindow.cpp @@ -35,7 +35,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kProgressWindowWidgets = makeWidgets( - makeWindowShim(STR_STRINGID, kWindowWidth, kWindowHeight) + makeWindowShim(STR_STRINGID, { kWindowWidth, kWindowHeight }) ); struct LoaderVehicleStyle diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp index bf7bc1b8ba..b80d3a25da 100644 --- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp +++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp @@ -33,7 +33,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_ride_refurbish_widgets = makeWidgets( - makeWindowShim(STR_REFURBISH_RIDE, WW, WH), + makeWindowShim(STR_REFURBISH_RIDE, { WW, WH }), makeWidget({ 10, WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_REFURBISH), makeWidget({ WW - 95, WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index ad8b4e88a0..ca066ea8a3 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -69,7 +69,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_research_development_widgets = makeWidgets( - makeWindowShim(STR_RESEARCH_AND_DEVELOPMENT, WW_DEVELOPMENT, WH_DEVELOPMENT), + makeWindowShim(STR_RESEARCH_AND_DEVELOPMENT, { WW_DEVELOPMENT, WH_DEVELOPMENT }), makeWidget({ 0, 43}, { WW_DEVELOPMENT, 153}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP), makeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), @@ -79,7 +79,7 @@ namespace OpenRCT2::Ui::Windows ); static constexpr auto window_research_funding_widgets = makeWidgets( - makeWindowShim(STR_RESEARCH_FUNDING, WW_FUNDING, WH_FUNDING), + makeWindowShim(STR_RESEARCH_FUNDING, { WW_FUNDING, WH_FUNDING }), makeWidget({ 0, 43}, { WW_FUNDING, 164}, WidgetType::resize, WindowColour::secondary ), makeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), makeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index e878316726..8a6e997076 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -243,7 +243,7 @@ namespace OpenRCT2::Ui::Windows constexpr int32_t RCT1_LIGHT_OFFSET = 4; static constexpr auto kMainRideWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43}, {kMinimumWindowWidth, 137}, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_VIEW_OF_RIDE_ATTRACTION_TIP), makeTab({ 34, 17 }, STR_VEHICLE_DETAILS_AND_OPTIONS_TIP), diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 455ef5994e..6feeab5791 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -145,7 +145,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kRideConstructionWidgets = makeWidgets( - makeWindowShim(kWindowTitle, WW, WH), + makeWindowShim(kWindowTitle, { WW, WH }), makeWidget ({ 3, 17}, { GW, 57}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_DIRECTION ), makeWidget ({ 3, 76}, { GW, 41}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_SLOPE ), makeWidget ({ 3, 120}, { GW, 41}, WidgetType::groupbox, WindowColour::primary , STR_RIDE_CONSTRUCTION_ROLL_BANKING ), diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 9285a1d5e7..420766b090 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -65,7 +65,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _rideListWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43}, {340, 197}, WidgetType::resize, WindowColour::secondary ), // tab page background makeWidget({315, 60}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_TOGGLE_OPEN_CLOSE), STR_OPEN_OR_CLOSE_ALL_RIDES ), // open / close all toggle makeWidget({150, 46}, {124, 12}, WidgetType::dropdownMenu, WindowColour::secondary ), // current information type diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index df8471a902..fe4d941c0b 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -41,7 +41,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _savePromptWidgets = makeWidgets( - makeWindowShim(kStringIdNone, WW_SAVE, WH_SAVE), + makeWindowShim(kStringIdNone, { WW_SAVE, WH_SAVE }), makeWidget({ 2, 19}, {256, 12}, WidgetType::labelCentred, WindowColour::primary, kStringIdEmpty ), // question/label makeWidget({ 8, 35}, { 78, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_SAVE ), // save makeWidget({ 91, 35}, { 78, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_DONT_SAVE), // don't save @@ -60,7 +60,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _quitPromptWidgets = makeWidgets( - makeWindowShim(STR_QUIT_GAME_PROMPT_TITLE, WW_QUIT, WH_QUIT), + makeWindowShim(STR_QUIT_GAME_PROMPT_TITLE, { WW_QUIT, WH_QUIT }), makeWidget({ 8, 19}, {78, 14}, WidgetType::button, WindowColour::primary, STR_OK ), // ok makeWidget({91, 19}, {78, 14}, WidgetType::button, WindowColour::primary, STR_CANCEL) // cancel ); diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index f56a0532c8..002260dc63 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -104,7 +104,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _scenarioSelectWidgets = makeWidgets( - makeWindowShim(kWindowTitle, kWindowWidth, kWindowHeight), + makeWindowShim(kWindowTitle, { kWindowWidth, kWindowHeight }), makeWidget({ kTabWidth + 1, kWidgetsStart }, { kWindowWidth, 284 }, WidgetType::resize, WindowColour::secondary), // tab content panel makeRemapWidget({ 3, kTabsStart + (kTabHeight * 0) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 01 makeRemapWidget({ 3, kTabsStart + (kTabHeight * 1) }, { kTabWidth, kTabHeight}, WidgetType::tab, WindowColour::secondary, SPR_G2_SIDEWAYS_TAB), // tab 02 diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index f4ceff2f5d..736e4b874e 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -110,7 +110,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto WindowSceneryBaseWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WINDOW_SCENERY_MIN_WIDTH, WINDOW_SCENERY_MIN_HEIGHT), + makeWindowShim(WINDOW_TITLE, { WINDOW_SCENERY_MIN_WIDTH, WINDOW_SCENERY_MIN_HEIGHT }), makeWidget ({ 0, 43}, {634, 99}, WidgetType::resize, WindowColour::secondary ), // 8 0x009DE2C8 makeWidget ({ 2, 62}, {607, 80}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL ), // 1000000 0x009DE418 makeWidget ({609, 59}, { 24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_OBJECTS_90 ), // 2000000 0x009DE428 diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp index 998f9a4cb7..a6aa63547e 100644 --- a/src/openrct2-ui/windows/SceneryScatter.cpp +++ b/src/openrct2-ui/windows/SceneryScatter.cpp @@ -39,7 +39,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _sceneryScatterWidgets = makeWidgets( - makeWindowShim(STR_SCENERY_SCATTER, 86, 100), + makeWindowShim(STR_SCENERY_SCATTER, { 86, 100 }), makeWidget ({20, 17}, {44, 32}, WidgetType::imgBtn, WindowColour::secondary, ImageId(SPR_LAND_TOOL_SIZE_0) ), // preview box makeRemapWidget({21, 18}, {16, 16}, WidgetType::trnBtn, WindowColour::secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index b2655502f2..ecec9b6dd0 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -64,7 +64,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _serverListWidgets = makeWidgets( - makeWindowShim(STR_SERVER_LIST, 340, 90), + makeWindowShim(STR_SERVER_LIST, { 340, 90 }), makeWidget({100, 20}, {245, 12}, WidgetType::textBox, WindowColour::secondary ), // player name text box makeWidget({ 6, 37}, {489, 226}, WidgetType::scroll, WindowColour::secondary ), // server list makeWidget({ 6, 53}, {101, 14}, WidgetType::button, WindowColour::secondary, STR_FETCH_SERVERS ), // fetch servers button diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 00ac5e2837..3db9a69fcc 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -47,7 +47,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _windowServerStartWidgets = makeWidgets( - makeWindowShim(STR_START_SERVER, WW, WH), + makeWindowShim(STR_START_SERVER, { WW, WH }), makeWidget({ 120, 20 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // port text box makeWidget({ 120, 36 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // name text box makeWidget({ 120, 52 }, { 173, 13 }, WidgetType::textBox, WindowColour::secondary), // description text box diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index f8e443da9d..a54eb466c9 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -43,7 +43,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _shortcutWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({0, 43}, {350, 287}, WidgetType::resize, WindowColour::secondary), makeWidget({4, 47}, {412, 215}, WidgetType::scroll, WindowColour::primary, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ), makeWidget({4, WH-15}, {150, 12}, WidgetType::button, WindowColour::primary, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP) @@ -61,7 +61,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto window_shortcut_change_widgets = makeWidgets( - makeWindowShim(CHANGE_WINDOW_TITLE, CHANGE_WW, CHANGE_WH), + makeWindowShim(CHANGE_WINDOW_TITLE, { CHANGE_WW, CHANGE_WH }), makeWidget({ 75, 56 }, { 100, 14 }, WidgetType::button, WindowColour::primary, STR_SHORTCUT_REMOVE, STR_SHORTCUT_REMOVE_TIP) ); // clang-format on @@ -579,7 +579,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto WindowResetShortcutKeysPromptWidgets = makeWidgets( - makeWindowShim(STR_SHORTCUT_ACTION_RESET, RESET_PROMPT_WW, RESET_PROMPT_WH), + makeWindowShim(STR_SHORTCUT_ACTION_RESET, { RESET_PROMPT_WW, RESET_PROMPT_WH }), makeWidget({ 2, 30 }, { RESET_PROMPT_WW - 4, 12 }, WidgetType::labelCentred, WindowColour::primary, STR_RESET_SHORTCUT_KEYS_PROMPT), makeWidget({ 8, RESET_PROMPT_WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_RESET), makeWidget({ RESET_PROMPT_WW - 95, RESET_PROMPT_WH - 22 }, { 85, 14 }, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index a54d4e4058..aef82739b6 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -50,7 +50,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off // 0x9AEE00 static constexpr auto _signWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 3, 17}, {85, 60}, WidgetType::viewport, WindowColour::secondary ), // Viewport makeWidget({WW - 25, 19}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_RENAME), STR_CHANGE_SIGN_TEXT_TIP ), // change sign button makeWidget({WW - 25, 67}, {24, 24}, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_DEMOLISH), STR_DEMOLISH_SIGN_TIP ), // demolish button diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 9caa77def0..ccb02fe023 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -86,7 +86,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto kMainStaffWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43 }, { 190, 137 }, WidgetType::resize, WindowColour::secondary), makeTab({ 3, 17 }, STR_STAFF_OVERVIEW_TIP), makeTab({ 34, 17 }, STR_STAFF_OPTIONS_TIP), diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index 8a6610ec7b..4ff1a2c634 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -36,7 +36,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off // 0x9AFB4C static constexpr auto _staffFireWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 10, WH - 20}, {85, 14}, WidgetType::button, WindowColour::primary, STR_YES ), makeWidget({WW - 95, WH - 20}, {85, 14}, WidgetType::button, WindowColour::primary, STR_SAVE_PROMPT_CANCEL) ); diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index e3703d4428..9e608c2628 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -80,7 +80,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _staffListWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43}, { WW, WH - 43}, WidgetType::resize, WindowColour::secondary ), // tab content panel makeTab ({ 3, 17}, STR_STAFF_HANDYMEN_TAB_TIP ), // handymen tab makeTab ({ 34, 17}, STR_STAFF_MECHANICS_TAB_TIP ), // mechanics tab diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 70fca2249b..de1bc60b56 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -35,7 +35,7 @@ namespace OpenRCT2::Ui::Windows }; static constexpr auto _textInputWidgets = makeWidgets( - makeWindowShim(kStringIdNone, WW, WH), + makeWindowShim(kStringIdNone, { WW, WH }), makeWidget({ 170, 68 }, { 71, 14 }, WidgetType::button, WindowColour::secondary, STR_CANCEL), makeWidget({ 10, 68 }, { 71, 14 }, WidgetType::button, WindowColour::secondary, STR_OK)); diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index 44242b512c..4cf9c0a802 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -78,7 +78,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _themesWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 43}, {320, 64}, WidgetType::resize, WindowColour::secondary ), // tab content panel makeTab ({ 3, 17}, STR_THEMES_TAB_SETTINGS_TIP ), // settings tab makeTab ({ 34, 17}, STR_THEMES_TAB_MAIN_TIP ), // main ui tab diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index e5d6a96677..67a7cbc5b1 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -277,7 +277,7 @@ namespace OpenRCT2::Ui::Windows #define GBBB(GROUPTOP, row) (GBBT((GROUPTOP), row) + PropertyButtonSize.height) static constexpr auto kMainTileInspectorWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({3, 57}, {WW - 6, WH - PADDING_BOTTOM - 58}, WidgetType::scroll, WindowColour::secondary, SCROLL_VERTICAL), /* Element list */ /* X and Y spinners */ makeWidget ({ 4, 24}, {38, 14}, WidgetType::label, WindowColour::secondary, STR_TILE_INSPECTOR_X_LABEL), diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 2b3d6803f4..0a865ce5f2 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -42,13 +42,13 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _trackManageWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 10, 24}, {110, 12}, WidgetType::button, WindowColour::primary, STR_TRACK_MANAGE_RENAME), makeWidget({130, 24}, {110, 12}, WidgetType::button, WindowColour::primary, STR_TRACK_MANAGE_DELETE) ); static constexpr auto _trackDeletePromptWidgets = makeWidgets( - makeWindowShim(STR_DELETE_FILE, WW_DELETE_PROMPT, WH_DELETE_PROMPT), + makeWindowShim(STR_DELETE_FILE, { WW_DELETE_PROMPT, WH_DELETE_PROMPT }), makeWidget({ 10, 54}, {110, 12}, WidgetType::button, WindowColour::primary, STR_TRACK_MANAGE_DELETE), makeWidget({130, 54}, {110, 12}, WidgetType::button, WindowColour::primary, STR_CANCEL ) ); diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 7f32175878..05b3ef565f 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -68,7 +68,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _trackPlaceWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({173, 83}, { 24, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_ROTATE_ARROW), STR_ROTATE_90_TIP ), makeWidget({173, 59}, { 24, 24}, WidgetType::flatBtn, WindowColour::primary, ImageId(SPR_MIRROR_ARROW), STR_MIRROR_IMAGE_TIP ), makeWidget({ 4, 109}, {192, 12}, WidgetType::button, WindowColour::primary, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP), diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 979ce17936..628e01a2fc 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -55,7 +55,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _trackListWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 4, 18}, {218, 13}, WidgetType::tableHeader, WindowColour::primary, STR_SELECT_OTHER_RIDE ), makeWidget({ 4, 32}, {124, 13}, WidgetType::textBox, WindowColour::secondary ), makeWidget({130, 32}, { 92, 13}, WidgetType::button, WindowColour::primary, STR_OBJECT_SEARCH_CLEAR ), diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 719d302ae9..fd76fa688f 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -64,7 +64,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _transparancyWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 2, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_VEGETATION), STR_SEE_THROUGH_VEGETATION), makeWidget({ 27, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_HIDE_SCENERY), STR_SEE_THROUGH_SCENERY), makeWidget({ 52, 17}, HIDE_SIZE, WidgetType::flatBtn, WindowColour::secondary, ImageId(SPR_G2_BUTTON_FOOTPATH), STR_SEE_THROUGH_PATHS), diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index bfef33206c..e585a0715f 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -54,7 +54,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _viewClippingWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({ 11, 19}, { 159, 11}, WidgetType::checkbox, WindowColour::primary, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP ), // clip enable/disable check box makeWidget ({ 5, 36}, {WW - 10, 65}, WidgetType::groupbox, WindowColour::primary, STR_VIEW_CLIPPING_VERTICAL_CLIPPING ), makeSpinnerWidgets({ 90, 51}, { 79, 12}, WidgetType::spinner, WindowColour::primary, kStringIdNone, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE ), // clip height (3 widgets) diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index cac7c249b2..603baa849c 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -45,7 +45,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _viewportWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget({ 0, 14}, { WW - 1, WH - 1}, WidgetType::resize, WindowColour::secondary ), // resize makeWidget({ 3, 17}, {WW - 26, WH - 3}, WidgetType::viewport, WindowColour::primary ), // viewport makeWidget({WW - 25, 17}, VIEWPORT_BUTTON, WidgetType::flatBtn, WindowColour::primary , ImageId(SPR_G2_ZOOM_IN), STR_ZOOM_IN_TIP ), // zoom in diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 90d3dcd70c..42dd99c30c 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -41,7 +41,7 @@ namespace OpenRCT2::Ui::Windows // clang-format off static constexpr auto _waterWidgets = makeWidgets( - makeWindowShim(WINDOW_TITLE, WW, WH), + makeWindowShim(WINDOW_TITLE, { WW, WH }), makeWidget ({16, 17}, {44, 32}, WidgetType::imgBtn, WindowColour::primary , ImageId(SPR_LAND_TOOL_SIZE_0), kStringIdNone), // preview box makeRemapWidget({17, 18}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_WATER_TIP), // decrement size makeRemapWidget({43, 32}, {16, 16}, WidgetType::trnBtn, WindowColour::tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_WATER_TIP) // increment size