From 205fc3332bb70f62c8fc4c3d3d4de878d5646dcb Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 21 Jul 2020 17:38:57 +0200 Subject: [PATCH] Refactor more widget definitions * Increase height for changelog button in about window * Tackle banner window * Tackle changelog window * Tackle custom currency window * Tackle finance summary * Tackle quit prompt widgets * Tackle debug paint widgets * Tackle demolish and refurbish prompt widgets --- src/openrct2-ui/windows/About.cpp | 4 ++-- src/openrct2-ui/windows/Banner.cpp | 14 +++++++------- src/openrct2-ui/windows/Changelog.cpp | 4 ++-- src/openrct2-ui/windows/CustomCurrency.cpp | 8 ++++---- src/openrct2-ui/windows/DebugPaint.cpp | 12 ++++++------ src/openrct2-ui/windows/DemolishRidePrompt.cpp | 15 ++++++--------- src/openrct2-ui/windows/Finances.cpp | 6 +++--- src/openrct2-ui/windows/SavePrompt.cpp | 4 ++-- 8 files changed, 32 insertions(+), 35 deletions(-) diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index d09874148f..37096c97c2 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -53,13 +53,13 @@ enum WINDOW_ABOUT_WIDGET_IDX { static rct_widget window_about_openrct2_widgets[] = { WIDGETS_MAIN, - MakeWidget({100, WH - TABHEIGHT}, {200, 12}, WWT_BUTTON, 1, STR_CHANGELOG_ELLIPSIS), // changelog button + MakeWidget({100, WH - TABHEIGHT}, {200, 14}, WWT_BUTTON, 1, STR_CHANGELOG_ELLIPSIS), // changelog button { WIDGETS_END } }; static rct_widget window_about_rct2_widgets[] = { WIDGETS_MAIN, - MakeWidget({100, WH - TABHEIGHT}, {200, 12}, WWT_BUTTON, 1, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS), // music credits button + MakeWidget({100, WH - TABHEIGHT}, {200, 14}, WWT_BUTTON, 1, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS), // music credits button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index b876bb30f5..0f32ad7198 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -59,13 +59,13 @@ static constexpr const rct_string_id BannerColouredTextFormats[] = { static rct_widget window_banner_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_VIEWPORT, 1, 3, WW - 26,17, WH - 20, 0x0FFFFFFFE, STR_NONE}, // tab content panel - { WWT_FLATBTN, 1, WW - 25, WW - 2, 19, 42, SPR_RENAME, STR_CHANGE_BANNER_TEXT_TIP}, // change banner button - { WWT_FLATBTN, 1, WW - 25, WW - 2, 43, 66, SPR_NO_ENTRY, STR_SET_AS_NO_ENTRY_BANNER_TIP}, // no entry button - { WWT_FLATBTN, 1, WW - 25, WW - 2, 67, 90, SPR_DEMOLISH, STR_DEMOLISH_BANNER_TIP}, // demolish button - { WWT_COLOURBTN, 1, 5, 16, WH - 16,WH - 5, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP}, // high money - { WWT_DROPDOWN, 1, 43, 81, WH - 16,WH - 5, 0xFFFFFFFF, STR_NONE}, // high money - { WWT_BUTTON, 1, 70, 80, WH - 15,WH - 6, STR_DROPDOWN_GLYPH, STR_SELECT_TEXT_COLOUR_TIP}, // high money + MakeWidget({ 3, 17}, {85, 60}, WWT_VIEWPORT, 1, 0x0FFFFFFFE ), // tab content panel + MakeWidget({WW - 25, 19}, {24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_CHANGE_BANNER_TEXT_TIP ), // change banner button + MakeWidget({WW - 25, 43}, {24, 24}, WWT_FLATBTN, 1, SPR_NO_ENTRY, STR_SET_AS_NO_ENTRY_BANNER_TIP ), // no entry button + MakeWidget({WW - 25, 67}, {24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_DEMOLISH_BANNER_TIP ), // demolish button + MakeWidget({ 5, WH - 16}, {12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // high money + MakeWidget({ 43, WH - 16}, {39, 12}, WWT_DROPDOWN, 1 ), // high money + MakeWidget({ 70, WH - 15}, {11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_TEXT_COLOUR_TIP ), // high money { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 9f04431f58..fb41aa02b8 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -40,8 +40,8 @@ constexpr int32_t MIN_WH = 200; static rct_widget window_changelog_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - { WWT_RESIZE, 1, 0, WW - 1, 14, WH - 1, 0xFFFFFFFF, STR_NONE }, // content panel - { WWT_SCROLL, 1, 3, WW - 3, 16, WH - 15, SCROLL_BOTH, STR_NONE }, // scroll area + MakeWidget({0, 14}, {500, 386}, WWT_RESIZE, 1 ), // content panel + MakeWidget({3, 16}, {495, 370}, WWT_SCROLL, 1, SCROLL_BOTH), // scroll area { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index 58173c24d7..7a229426dc 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -35,10 +35,10 @@ enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX { static rct_widget window_custom_currency_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - SPINNER_WIDGETS (1, 100, 200, 30, 40, STR_CHEAT_CURRENCY_FORMAT, STR_NONE), // NB: 3 widgets - { WWT_BUTTON, 1, 120, 200, 50, 60, 0, STR_NONE }, - { WWT_DROPDOWN, 1, 220, 350, 50, 60, STR_NONE, STR_NONE }, - { WWT_BUTTON, 1, 339, 349, 51, 59, STR_DROPDOWN_GLYPH, STR_NONE }, + MakeSpinnerWidgets({100, 30}, {101, 11}, WWT_SPINNER, 1, STR_CHEAT_CURRENCY_FORMAT), // NB: 3 widgets + MakeWidget ({120, 50}, { 81, 11}, WWT_BUTTON, 1, STR_EMPTY ), + MakeWidget ({220, 50}, {131, 11}, WWT_DROPDOWN, 1 ), + MakeWidget ({339, 51}, { 11, 9}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 46c1d35b1b..9f44715409 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -36,12 +36,12 @@ constexpr int32_t WINDOW_WIDTH = 200; constexpr int32_t WINDOW_HEIGHT = 8 + 15 + 15 + 15 + 15 + 11 + 8; static rct_widget window_debug_paint_widgets[] = { - { WWT_FRAME, 0, 0, WINDOW_WIDTH - 1, 0, WINDOW_HEIGHT - 1, STR_NONE, STR_NONE }, - { WWT_CHECKBOX, 1, 8, WINDOW_WIDTH - 8, 8 + 15 * 0, 8 + 15 * 0 + 11, STR_DEBUG_PAINT_SHOW_WIDE_PATHS, STR_NONE }, - { WWT_CHECKBOX, 1, 8, WINDOW_WIDTH - 8, 8 + 15 * 1, 8 + 15 * 1 + 11, STR_DEBUG_PAINT_SHOW_BLOCKED_TILES, STR_NONE }, - { WWT_CHECKBOX, 1, 8, WINDOW_WIDTH - 8, 8 + 15 * 2, 8 + 15 * 2 + 11, STR_DEBUG_PAINT_SHOW_SEGMENT_HEIGHTS, STR_NONE }, - { WWT_CHECKBOX, 1, 8, WINDOW_WIDTH - 8, 8 + 15 * 3, 8 + 15 * 3 + 11, STR_DEBUG_PAINT_SHOW_BOUND_BOXES, STR_NONE }, - { WWT_CHECKBOX, 1, 8, WINDOW_WIDTH - 8, 8 + 15 * 4, 8 + 15 * 4 + 11, STR_DEBUG_PAINT_SHOW_DIRTY_VISUALS, STR_NONE }, + MakeWidget({0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT}, WWT_FRAME, 0), + MakeWidget({8, 8 + 15 * 0}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_WIDE_PATHS ), + MakeWidget({8, 8 + 15 * 1}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_BLOCKED_TILES ), + MakeWidget({8, 8 + 15 * 2}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_SEGMENT_HEIGHTS), + MakeWidget({8, 8 + 15 * 3}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_BOUND_BOXES ), + MakeWidget({8, 8 + 15 * 4}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_DIRTY_VISUALS ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index ce4a3f2cd7..daca7f64fa 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -18,7 +18,6 @@ static constexpr const int32_t WW = 200; static constexpr const int32_t WH = 100; -static constexpr const rct_string_id WINDOW_TITLE = STR_DEMOLISH_RIDE; static money32 _demolishRideCost; @@ -34,18 +33,16 @@ enum WINDOW_RIDE_DEMOLISH_WIDGET_IDX { // 0x009AEBA0 static rct_widget window_ride_demolish_widgets[] = { - WINDOW_SHIM_WHITE(WINDOW_TITLE, WW, WH), - { WWT_BUTTON, 0, 10, 94, WH - 20, WH - 9, STR_DEMOLISH, STR_NONE }, - { WWT_BUTTON, 0, WW - 95, WW - 11, WH - 20, WH - 9, STR_SAVE_PROMPT_CANCEL, STR_NONE }, + WINDOW_SHIM_WHITE(STR_DEMOLISH_RIDE, WW, WH), + MakeWidget({ 10, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_DEMOLISH ), + MakeWidget({WW - 95, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_CANCEL), { WIDGETS_END } }; static rct_widget window_ride_refurbish_widgets[] = { - { WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, STR_NONE, STR_NONE }, - { WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_REFURBISH_RIDE, STR_WINDOW_TITLE_TIP }, - { WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X_WHITE, STR_CLOSE_WINDOW_TIP }, - { WWT_BUTTON, 0, 10, 94, WH - 20, WH - 9, STR_REFURBISH, STR_NONE }, - { WWT_BUTTON, 0, WW - 95, WW - 11, WH - 20, WH - 9, STR_SAVE_PROMPT_CANCEL, STR_NONE }, + WINDOW_SHIM_WHITE(STR_REFURBISH_RIDE, WW, WH), + MakeWidget({ 10, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_REFURBISH ), + MakeWidget({WW - 95, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_CANCEL), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 705b242e38..f67694699d 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -96,10 +96,10 @@ enum static rct_widget _windowFinancesSummaryWidgets[] = { WINDOW_SHIM(STR_FINANCIAL_SUMMARY, WW_OTHER_TABS, WH_SUMMARY), - { WWT_RESIZE, 1, 0, 529, 43, WH_SUMMARY - 1, 0xFFFFFFFF, STR_NONE }, + MakeWidget ({ 0, 43}, {530, 266}, WWT_RESIZE, 1), TAB_WIDGETS, - { WWT_SCROLL, 1, 130, 520, 50, 260, SCROLL_HORIZONTAL, STR_NONE }, - SPINNER_WIDGETS (1, 64, 160, 279, 292, STR_FINANCES_SUMMARY_LOAN_VALUE, STR_NONE), // NB: 3 widgets. + MakeWidget ({130, 50}, {391, 211}, WWT_SCROLL, 1, SCROLL_HORIZONTAL ), + MakeSpinnerWidgets({ 64, 279}, { 97, 14}, WWT_SPINNER, 1, STR_FINANCES_SUMMARY_LOAN_VALUE), // NB: 3 widgets. { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 2743ebbaaf..f8d5edefb1 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -55,8 +55,8 @@ enum WINDOW_QUIT_PROMPT_WIDGET_IDX { static rct_widget window_quit_prompt_widgets[] = { WINDOW_SHIM_WHITE(STR_QUIT_GAME_PROMPT_TITLE, WW_QUIT, WH_QUIT), - { WWT_BUTTON, 0, 8, 85, 19, 32, STR_OK, STR_NONE }, // ok - { WWT_BUTTON, 0, 91, 168, 19, 32, STR_CANCEL, STR_NONE }, // cancel + MakeWidget({ 8, 19}, {78, 14}, WWT_BUTTON, 0, STR_OK ), // ok + MakeWidget({91, 19}, {78, 14}, WWT_BUTTON, 0, STR_CANCEL), // cancel { WIDGETS_END }, };