From 6b9211c8b841638a6830992ec50411d118426e9c Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Mon, 17 Aug 2020 17:53:37 +0200 Subject: [PATCH] Refactor Park, Player, Research, Ride* to use MakeTab --- src/openrct2-ui/windows/Park.cpp | 16 +++++------ src/openrct2-ui/windows/Player.cpp | 12 ++++----- src/openrct2-ui/windows/Research.cpp | 40 ++++++++++++++-------------- src/openrct2-ui/windows/Ride.cpp | 22 +++++++-------- src/openrct2-ui/windows/RideList.cpp | 24 ++++++++--------- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 017ecdb3a6..03ad9d2178 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -80,14 +80,14 @@ enum WINDOW_PARK_WIDGET_IDX { #define MAIN_PARK_WIDGETS(WW) \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {WW, 131}, WWT_RESIZE, 1 ), /* tab content panel */ \ - MakeRemapWidget({ 3, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_ENTRANCE_TAB_TIP ), /* tab 1 */ \ - MakeRemapWidget({ 34, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_RATING_TAB_TIP ), /* tab 2 */ \ - MakeRemapWidget({ 65, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_GUESTS_TAB_TIP ), /* tab 3 */ \ - MakeRemapWidget({ 96, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_PRICE_TAB_TIP ), /* tab 4 */ \ - MakeRemapWidget({127, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_STATS_TAB_TIP ), /* tab 5 */ \ - MakeRemapWidget({158, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_OBJECTIVE_TAB_TIP), /* tab 6 */ \ - MakeRemapWidget({189, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_PARK_AWARDS_TAB_TIP ) /* tab 7 */ + MakeWidget({ 0, 43}, {WW, 131}, WWT_RESIZE, 1 ), /* tab content panel */ \ + MakeTab ({ 3, 17}, STR_PARK_ENTRANCE_TAB_TIP ), /* tab 1 */ \ + MakeTab ({ 34, 17}, STR_PARK_RATING_TAB_TIP ), /* tab 2 */ \ + MakeTab ({ 65, 17}, STR_PARK_GUESTS_TAB_TIP ), /* tab 3 */ \ + MakeTab ({ 96, 17}, STR_PARK_PRICE_TAB_TIP ), /* tab 4 */ \ + MakeTab ({127, 17}, STR_PARK_STATS_TAB_TIP ), /* tab 5 */ \ + MakeTab ({158, 17}, STR_PARK_OBJECTIVE_TAB_TIP), /* tab 6 */ \ + MakeTab ({189, 17}, STR_PARK_AWARDS_TAB_TIP ) /* tab 7 */ static rct_widget window_park_entrance_widgets[] = { MAIN_PARK_WIDGETS(230), diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 5944dbf991..d5b4b7fbd7 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -48,12 +48,12 @@ enum WINDOW_PLAYER_WIDGET_IDX { }; #define WINDOW_PLAYER_COMMON_WIDGETS \ - MakeWidget ({ 0, 0}, {192, 157}, WWT_FRAME, 0 ), /* Panel / Background */ \ - MakeWidget ({ 1, 1}, {190, 14}, WWT_CAPTION, 0, STR_STRING, STR_WINDOW_TITLE_TIP), /* Title */ \ - MakeWidget ({179, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), /* Close x button */ \ - MakeWidget ({ 0, 43}, {192, 114}, WWT_RESIZE, 1 ), /* Resize */ \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB ), /* Tab 1 */ \ - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB ) /* Tab 2 */ + MakeWidget({ 0, 0}, {192, 157}, WWT_FRAME, 0 ), /* Panel / Background */ \ + MakeWidget({ 1, 1}, {190, 14}, WWT_CAPTION, 0, STR_STRING, STR_WINDOW_TITLE_TIP), /* Title */ \ + MakeWidget({179, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), /* Close x button */ \ + MakeWidget({ 0, 43}, {192, 114}, WWT_RESIZE, 1 ), /* Resize */ \ + MakeTab ({ 3, 17} ), /* Tab 1 */ \ + MakeTab ({ 34, 17} ) /* Tab 2 */ static rct_widget window_player_overview_widgets[] = { WINDOW_PLAYER_COMMON_WIDGETS, diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index ae3486454f..7bc182f765 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -62,31 +62,31 @@ enum { static rct_widget window_research_development_widgets[] = { WINDOW_SHIM(STR_RESEARCH_AND_DEVELOPMENT, WW_DEVELOPMENT, WH_DEVELOPMENT), - MakeWidget ({ 0, 43}, { WW_DEVELOPMENT, 153}, WWT_RESIZE, 1 ), - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP), - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_RESEARCH_TIP ), - MakeWidget ({ 3, 47}, {WW_DEVELOPMENT - 10, 70}, WWT_GROUPBOX, 2, STR_CURRENTLY_IN_DEVELOPMENT ), - MakeWidget ({ 3, 124}, {WW_DEVELOPMENT - 10, 65}, WWT_GROUPBOX, 2, STR_LAST_DEVELOPMENT ), - MakeWidget ({265, 161}, { 24, 24}, WWT_FLATBTN, 2, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ), + MakeWidget({ 0, 43}, { WW_DEVELOPMENT, 153}, WWT_RESIZE, 1), + MakeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), + MakeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), + MakeWidget({ 3, 47}, {WW_DEVELOPMENT - 10, 70}, WWT_GROUPBOX, 2, STR_CURRENTLY_IN_DEVELOPMENT ), + MakeWidget({ 3, 124}, {WW_DEVELOPMENT - 10, 65}, WWT_GROUPBOX, 2, STR_LAST_DEVELOPMENT ), + MakeWidget({265, 161}, { 24, 24}, WWT_FLATBTN, 2, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ), { WIDGETS_END }, }; static rct_widget window_research_funding_widgets[] = { WINDOW_SHIM(STR_RESEARCH_FUNDING, WW_FUNDING, WH_FUNDING), - MakeWidget ({ 0, 43}, { WW_FUNDING, 164}, WWT_RESIZE, 1 ), - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP ), - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_RESEARCH_TIP ), - MakeWidget ({ 3, 47}, { WW_FUNDING - 6, 45}, WWT_GROUPBOX, 2, STR_RESEARCH_FUNDING_ ), - MakeWidget ({ 8, 59}, { 160, 14}, WWT_DROPDOWN, 2, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), - MakeWidget ({156, 60}, { 11, 12}, WWT_BUTTON, 2, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), - MakeWidget ({ 3, 96}, { WW_FUNDING - 6, 107}, WWT_GROUPBOX, 2, STR_RESEARCH_PRIORITIES ), - MakeWidget ({ 8, 108}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), - MakeWidget ({ 8, 121}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), - MakeWidget ({ 8, 134}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), - MakeWidget ({ 8, 147}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), - MakeWidget ({ 8, 160}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), - MakeWidget ({ 8, 173}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), - MakeWidget ({ 8, 186}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ), + MakeWidget({ 0, 43}, { WW_FUNDING, 164}, WWT_RESIZE, 1), + MakeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), + MakeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), + MakeWidget({ 3, 47}, { WW_FUNDING - 6, 45}, WWT_GROUPBOX, 2, STR_RESEARCH_FUNDING_ ), + MakeWidget({ 8, 59}, { 160, 14}, WWT_DROPDOWN, 2, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + MakeWidget({156, 60}, { 11, 12}, WWT_BUTTON, 2, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + MakeWidget({ 3, 96}, { WW_FUNDING - 6, 107}, WWT_GROUPBOX, 2, STR_RESEARCH_PRIORITIES ), + MakeWidget({ 8, 108}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), + MakeWidget({ 8, 121}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), + MakeWidget({ 8, 134}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), + MakeWidget({ 8, 147}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), + MakeWidget({ 8, 160}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), + MakeWidget({ 8, 173}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), + MakeWidget({ 8, 186}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 6bc0e3dd57..5004e5b650 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -209,17 +209,17 @@ constexpr int32_t RCT1_LIGHT_OFFSET = 4; #define MAIN_RIDE_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {316, 137}, WWT_RESIZE, 1 ), \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_VIEW_OF_RIDE_ATTRACTION_TIP ), \ - MakeRemapWidget({ 34, 17}, { 31, 30}, WWT_TAB, 1, SPR_TAB, STR_VEHICLE_DETAILS_AND_OPTIONS_TIP), \ - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPERATING_OPTIONS_TIP ), \ - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_MAINTENANCE_OPTIONS_TIP ), \ - MakeRemapWidget({127, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_COLOUR_SCHEME_OPTIONS_TIP ), \ - MakeRemapWidget({158, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SOUND_AND_MUSIC_OPTIONS_TIP ), \ - MakeRemapWidget({189, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_MEASUREMENTS_AND_TEST_DATA_TIP ), \ - MakeRemapWidget({220, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_GRAPHS_TIP ), \ - MakeRemapWidget({251, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_INCOME_AND_COSTS_TIP ), \ - MakeRemapWidget({282, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_CUSTOMER_INFORMATION_TIP ) + MakeWidget({ 0, 43}, {316, 137}, WWT_RESIZE, 1 ), \ + MakeTab ({ 3, 17}, STR_VIEW_OF_RIDE_ATTRACTION_TIP ), \ + MakeTab ({ 34, 17}, STR_VEHICLE_DETAILS_AND_OPTIONS_TIP), \ + MakeTab ({ 65, 17}, STR_OPERATING_OPTIONS_TIP ), \ + MakeTab ({ 96, 17}, STR_MAINTENANCE_OPTIONS_TIP ), \ + MakeTab ({127, 17}, STR_COLOUR_SCHEME_OPTIONS_TIP ), \ + MakeTab ({158, 17}, STR_SOUND_AND_MUSIC_OPTIONS_TIP ), \ + MakeTab ({189, 17}, STR_MEASUREMENTS_AND_TEST_DATA_TIP ), \ + MakeTab ({220, 17}, STR_GRAPHS_TIP ), \ + MakeTab ({251, 17}, STR_INCOME_AND_COSTS_TIP ), \ + MakeTab ({282, 17}, STR_CUSTOMER_INFORMATION_TIP ) // 0x009ADC34 static rct_widget window_ride_main_widgets[] = { diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 0eda9ea8c8..99b8a67afa 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -57,18 +57,18 @@ enum WINDOW_RIDE_LIST_WIDGET_IDX { static rct_widget window_ride_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {340, 197}, WWT_RESIZE, 1 ), // tab page background - MakeWidget ({315, 60}, { 24, 24}, WWT_FLATBTN, 1, SPR_TOGGLE_OPEN_CLOSE, STR_OPEN_OR_CLOSE_ALL_RIDES ), // open / close all toggle - MakeWidget ({150, 46}, {124, 12}, WWT_DROPDOWN, 1 ), // current information type - MakeWidget ({262, 47}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_RIDE_LIST_INFORMATION_TYPE_TIP), // information type dropdown button - MakeWidget ({280, 46}, { 54, 12}, WWT_BUTTON, 1, STR_SORT, STR_RIDE_LIST_SORT_TIP ), // sort button - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_LIST_RIDES_TIP ), // tab 1 - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_LIST_SHOPS_AND_STALLS_TIP ), // tab 2 - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_LIST_KIOSKS_AND_FACILITIES_TIP), // tab 3 - MakeWidget ({ 3, 60}, {334, 177}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // list - MakeWidget ({320, 62}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_CLOSE_BUTTON_0 ), - MakeWidget ({320, 76}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_OPEN_BUTTON_0 ), - MakeWidget ({315, 90}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_QUICK_DEMOLISH_RIDE ), + MakeWidget({ 0, 43}, {340, 197}, WWT_RESIZE, 1 ), // tab page background + MakeWidget({315, 60}, { 24, 24}, WWT_FLATBTN, 1, SPR_TOGGLE_OPEN_CLOSE, STR_OPEN_OR_CLOSE_ALL_RIDES ), // open / close all toggle + MakeWidget({150, 46}, {124, 12}, WWT_DROPDOWN, 1 ), // current information type + MakeWidget({262, 47}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_RIDE_LIST_INFORMATION_TYPE_TIP), // information type dropdown button + MakeWidget({280, 46}, { 54, 12}, WWT_BUTTON, 1, STR_SORT, STR_RIDE_LIST_SORT_TIP ), // sort button + MakeTab ({ 3, 17}, STR_LIST_RIDES_TIP ), // tab 1 + MakeTab ({ 34, 17}, STR_LIST_SHOPS_AND_STALLS_TIP ), // tab 2 + MakeTab ({ 65, 17}, STR_LIST_KIOSKS_AND_FACILITIES_TIP), // tab 3 + MakeWidget({ 3, 60}, {334, 177}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // list + MakeWidget({320, 62}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_CLOSE_BUTTON_0 ), + MakeWidget({320, 76}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_OPEN_BUTTON_0 ), + MakeWidget({315, 90}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_QUICK_DEMOLISH_RIDE ), { WIDGETS_END }, };