diff --git a/resources/g2/icons/tab_disabled.png b/resources/g2/icons/tab_disabled.png deleted file mode 100644 index 6422f149ee..0000000000 Binary files a/resources/g2/icons/tab_disabled.png and /dev/null differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 235d8fcd78..360d74dff9 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -236,9 +236,6 @@ { "path": "icons/paste.png" }, - { - "path": "icons/tab_disabled.png" - }, { "path": "track/intamin/booster_1.png" }, diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 6c0820f7d8..c2449c96a7 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -215,9 +215,21 @@ static void widget_tab_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetind // Get the widget rct_widget* widget = &w->widgets[widgetIndex]; - if (static_cast(widget->image) == -1) + if (widget->type != WWT_TAB && static_cast(widget->image) == -1) return; + if (widget->type == WWT_TAB) + { + if (widget_is_disabled(w, widgetIndex)) + return; + + if (widget->image != (IMAGE_TYPE_REMAP | SPR_TAB_LARGE)) + { + // Set standard tab sprite to use. + widget->image = IMAGE_TYPE_REMAP | SPR_TAB; + } + } + // Draw widgets that aren't explicitly disabled. if (!widget_is_disabled(w, widgetIndex)) { @@ -225,10 +237,6 @@ static void widget_tab_draw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgetind return; } - // Do not draw hidden tabs, unless given a sprite. - if (widget->type == WWT_TAB && widget->image != (IMAGE_TYPE_REMAP | SPR_G2_TAB_DISABLED)) - return; - if (widget->type != WWT_TRNBTN) { widget_draw_image(dpi, w, widgetIndex); diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index ff674e51db..d2139e68c8 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -195,11 +195,11 @@ static constexpr const int32_t TAB_START = 3; #define MAIN_CHEATS_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {WW, 257}, WWT_IMGBTN, 1 ), /* tab content panel */ \ - MakeRemapWidget({ 3, 17}, {TAB_WIDTH, TAB_HEIGHT}, WWT_TAB, 1, SPR_TAB, STR_FINANCIAL_CHEATS_TIP), /* tab 1 */ \ - MakeRemapWidget({34, 17}, {TAB_WIDTH, TAB_HEIGHT}, WWT_TAB, 1, SPR_TAB, STR_GUEST_CHEATS_TIP ), /* tab 2 */ \ - MakeRemapWidget({65, 17}, {TAB_WIDTH, TAB_HEIGHT}, WWT_TAB, 1, SPR_TAB, STR_PARK_CHEATS_TIP ), /* tab 3 */ \ - MakeRemapWidget({96, 17}, {TAB_WIDTH, TAB_HEIGHT}, WWT_TAB, 1, SPR_TAB, STR_RIDE_CHEATS_TIP ) /* tab 4 */ + MakeWidget({ 0, 43}, {WW, 257}, WWT_IMGBTN, 1), /* tab content panel */ \ + MakeTab ({ 3, 17}, STR_FINANCIAL_CHEATS_TIP), /* tab 1 */ \ + MakeTab ({34, 17}, STR_GUEST_CHEATS_TIP ), /* tab 2 */ \ + MakeTab ({65, 17}, STR_PARK_CHEATS_TIP ), /* tab 3 */ \ + MakeTab ({96, 17}, STR_RIDE_CHEATS_TIP ) /* tab 4 */ static rct_widget window_cheats_money_widgets[] = { diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index 30f659c522..d3ee28ef24 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -47,14 +47,14 @@ enum { static rct_widget window_editor_inventions_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ), - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB ), - MakeWidget ({ 4, 56}, {368, 161}, WWT_SCROLL, 1, SCROLL_VERTICAL ), - MakeWidget ({ 4, 231}, {368, 157}, WWT_SCROLL, 1, SCROLL_VERTICAL ), - MakeWidget ({431, 106}, {114, 114}, WWT_FLATBTN, 1 ), - MakeWidget ({375, 343}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_TOP ), - MakeWidget ({375, 358}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_BOTTOM ), - MakeWidget ({375, 373}, {220, 14}, WWT_BUTTON, 1, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP), + MakeWidget({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ), + MakeTab ({ 3, 17} ), + MakeWidget({ 4, 56}, {368, 161}, WWT_SCROLL, 1, SCROLL_VERTICAL ), + MakeWidget({ 4, 231}, {368, 157}, WWT_SCROLL, 1, SCROLL_VERTICAL ), + MakeWidget({431, 106}, {114, 114}, WWT_FLATBTN, 1 ), + MakeWidget({375, 343}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_TOP ), + MakeWidget({375, 358}, {220, 14}, WWT_BUTTON, 1, STR_MOVE_ALL_BOTTOM ), + MakeWidget({375, 373}, {220, 14}, WWT_BUTTON, 1, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 8f0e0ef9cc..35307bd275 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -142,26 +142,26 @@ validate_global_widx(WC_EDITOR_OBJECT_SELECTION, WIDX_TAB_1); static bool _window_editor_object_selection_widgets_initialised; static std::vector _window_editor_object_selection_widgets = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ), - MakeWidget ({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP), - MakeWidget ({ 4, 60}, {288, 327}, WWT_SCROLL, 1, SCROLL_VERTICAL ), - MakeWidget ({391, 45}, {114, 115}, WWT_FLATBTN, 1 ), - MakeWidget ({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP ), - MakeWidget ({350, 22}, {114, 14}, WWT_BUTTON, 0, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP ), - MakeWidget ({ 4, 45}, {211, 14}, WWT_TEXT_BOX, 1 ), - MakeWidget ({218, 45}, { 70, 14}, WWT_BUTTON, 1, STR_OBJECT_SEARCH_CLEAR ), - MakeWidget ({ 3, 73}, {285, 4}, WWT_IMGBTN, 1 ), - MakeRemapWidget({ 3, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_OBJECT_FILTER_ALL_RIDES_TIP ), - MakeRemapWidget({ 34, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TRANSPORT_RIDES_TIP ), - MakeRemapWidget({ 65, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_GENTLE_RIDES_TIP ), - MakeRemapWidget({ 96, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_ROLLER_COASTERS_TIP ), - MakeRemapWidget({127, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THRILL_RIDES_TIP ), - MakeRemapWidget({158, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_WATER_RIDES_TIP ), - MakeRemapWidget({189, 47}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOPS_STALLS_TIP ), - MakeWidget ({ 4, 80}, {145, 14}, WWT_TABLE_HEADER, 1 ), - MakeWidget ({149, 80}, {143, 14}, WWT_TABLE_HEADER, 1 ), + MakeWidget({ 0, 43}, {600, 357}, WWT_RESIZE, 1 ), + MakeWidget({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP), + MakeWidget({ 4, 60}, {288, 327}, WWT_SCROLL, 1, SCROLL_VERTICAL ), + MakeWidget({391, 45}, {114, 115}, WWT_FLATBTN, 1 ), + MakeWidget({470, 22}, {122, 14}, WWT_BUTTON, 0, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP ), + MakeWidget({350, 22}, {114, 14}, WWT_BUTTON, 0, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP ), + MakeWidget({ 4, 45}, {211, 14}, WWT_TEXT_BOX, 1 ), + MakeWidget({218, 45}, { 70, 14}, WWT_BUTTON, 1, STR_OBJECT_SEARCH_CLEAR ), + MakeWidget({ 3, 73}, {285, 4}, WWT_IMGBTN, 1 ), + MakeTab ({ 3, 47}, STR_OBJECT_FILTER_ALL_RIDES_TIP ), + MakeTab ({ 34, 47}, STR_TRANSPORT_RIDES_TIP ), + MakeTab ({ 65, 47}, STR_GENTLE_RIDES_TIP ), + MakeTab ({ 96, 47}, STR_ROLLER_COASTERS_TIP ), + MakeTab ({127, 47}, STR_THRILL_RIDES_TIP ), + MakeTab ({158, 47}, STR_WATER_RIDES_TIP ), + MakeTab ({189, 47}, STR_SHOPS_STALLS_TIP ), + MakeWidget({ 4, 80}, {145, 14}, WWT_TABLE_HEADER, 1 ), + MakeWidget({149, 80}, {143, 14}, WWT_TABLE_HEADER, 1 ), - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STRING_DEFINED_TOOLTIP ), + MakeTab ({ 3, 17}, STR_STRING_DEFINED_TOOLTIP ), // Copied object type times... { WIDGETS_END } diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index ff5c979653..ee4c8bfb78 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -87,9 +87,9 @@ enum { #define MAIN_OBJECTIVE_OPTIONS_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {280, 106}, WWT_RESIZE, 1 ), \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP), \ - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SELECT_RIDES_TO_BE_PRESERVED_TIP ) + MakeWidget({ 0, 43}, {280, 106}, WWT_RESIZE, 1 ), \ + MakeTab ({ 3, 17}, STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP), \ + MakeTab ({ 34, 17}, STR_SELECT_RIDES_TO_BE_PRESERVED_TIP ) static rct_widget window_editor_objective_options_main_widgets[] = { MAIN_OBJECTIVE_OPTIONS_WIDGETS, diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index d6f2c14055..6ab898f883 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -120,9 +120,9 @@ enum { static rct_widget window_editor_scenario_options_financial_widgets[] = { WINDOW_SHIM(STR_SCENARIO_OPTIONS_FINANCIAL, WW_FINANCIAL, WH_FINANCIAL), MakeWidget ({ 0, 43}, { WW_FINANCIAL, 106}, WWT_RESIZE, 1), - MakeRemapWidget ({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), - MakeRemapWidget ({ 34, 17}, { 31, 30}, WWT_TAB, 1, SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP ), - MakeRemapWidget ({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP ), + MakeTab ({ 3, 17}, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), + MakeTab ({ 34, 17}, STR_SCENARIO_OPTIONS_GUESTS_TIP ), + MakeTab ({ 65, 17}, STR_SCENARIO_OPTIONS_PARK_TIP ), MakeWidget ({ 8, 48}, {WW_FINANCIAL - 16, 12}, WWT_CHECKBOX, 1, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP ), MakeSpinnerWidgets({168, 65}, { 100, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets MakeSpinnerWidgets({168, 82}, { 100, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 15c7d9ddce..43fea6a86c 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -86,12 +86,12 @@ enum #pragma region Widgets #define TAB_WIDGETS \ - MakeRemapWidget({ 3, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_SUMMARY_TAB_TIP ), \ - MakeRemapWidget({ 34, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_CASH_TAB_TIP ), \ - MakeRemapWidget({ 65, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP ), \ - MakeRemapWidget({ 96, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_WEEKLY_PROFIT_TAB_TIP), \ - MakeRemapWidget({127, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_SHOW_MARKETING_TAB_TIP ), \ - MakeRemapWidget({158, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_FINANCES_RESEARCH_TIP ) + MakeTab({ 3, 17}, STR_FINANCES_SHOW_SUMMARY_TAB_TIP ), \ + MakeTab({ 34, 17}, STR_FINANCES_SHOW_CASH_TAB_TIP ), \ + MakeTab({ 65, 17}, STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP ), \ + MakeTab({ 96, 17}, STR_FINANCES_SHOW_WEEKLY_PROFIT_TAB_TIP), \ + MakeTab({127, 17}, STR_FINANCES_SHOW_MARKETING_TAB_TIP ), \ + MakeTab({158, 17}, STR_FINANCES_RESEARCH_TIP ) static rct_widget _windowFinancesSummaryWidgets[] = { diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 26db86f8c6..67c9bb63d0 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -76,14 +76,14 @@ static constexpr int32_t TabWidth = 30; #define MAIN_GUEST_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {192, 114}, WWT_RESIZE, 1 ), /* Resize */ \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_VIEW_TIP ), /* Tab 1 */ \ - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP ), /* Tab 2 */ \ - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_VISITED_RIDES_TIP), /* Tab 3 */ \ - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_FINANCE_TIP ), /* Tab 4 */ \ - MakeRemapWidget({127, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_THOUGHTS_TIP ), /* Tab 5 */ \ - MakeRemapWidget({158, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_GUEST_ITEMS_TIP ), /* Tab 6 */ \ - MakeRemapWidget({189, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_DEBUG_TIP ) /* Tab 7 */ + MakeWidget({ 0, 43}, {192, 114}, WWT_RESIZE, 1 ), /* Resize */ \ + MakeTab ({ 3, 17}, STR_SHOW_GUEST_VIEW_TIP ), /* Tab 1 */ \ + MakeTab ({ 34, 17}, STR_SHOW_GUEST_NEEDS_TIP ), /* Tab 2 */ \ + MakeTab ({ 65, 17}, STR_SHOW_GUEST_VISITED_RIDES_TIP), /* Tab 3 */ \ + MakeTab ({ 96, 17}, STR_SHOW_GUEST_FINANCE_TIP ), /* Tab 4 */ \ + MakeTab ({127, 17}, STR_SHOW_GUEST_THOUGHTS_TIP ), /* Tab 5 */ \ + MakeTab ({158, 17}, STR_SHOW_GUEST_ITEMS_TIP ), /* Tab 6 */ \ + MakeTab ({189, 17}, STR_DEBUG_TIP ) /* Tab 7 */ static rct_widget window_guest_overview_widgets[] = { MAIN_GUEST_WIDGETS, diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 2814c18973..02746d4c70 100644 --- a/src/openrct2-ui/windows/GuestList.cpp +++ b/src/openrct2-ui/windows/GuestList.cpp @@ -69,17 +69,17 @@ static constexpr const rct_string_id viewNames[VIEW_COUNT] = { static rct_widget window_guest_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {350, 287}, WWT_RESIZE, 1 ), // tab content panel - MakeWidget ({ 5, 59}, { 80, 12}, WWT_DROPDOWN, 1, STR_ARG_4_PAGE_X ), // page dropdown - MakeWidget ({ 73, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), // page dropdown button - MakeWidget ({120, 59}, {142, 12}, WWT_DROPDOWN, 1, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP ), // information type dropdown - MakeWidget ({250, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP ), // information type dropdown button - MakeWidget ({273, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_GUESTS_ON_MAP_TIP ), // map - MakeWidget ({297, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_SEARCH, STR_GUESTS_FILTER_BY_NAME_TIP), // filter by name - MakeWidget ({321, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_TRACK_PEEP, STR_TRACKED_GUESTS_ONLY_TIP ), // tracking - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_INDIVIDUAL_GUESTS_TIP ), // tab 1 - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SUMMARISED_GUESTS_TIP ), // tab 2 - MakeWidget ({ 3, 72}, {344, 255}, WWT_SCROLL, 1, SCROLL_BOTH ), // guest list + MakeWidget({ 0, 43}, {350, 287}, WWT_RESIZE, 1 ), // tab content panel + MakeWidget({ 5, 59}, { 80, 12}, WWT_DROPDOWN, 1, STR_ARG_4_PAGE_X ), // page dropdown + MakeWidget({ 73, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), // page dropdown button + MakeWidget({120, 59}, {142, 12}, WWT_DROPDOWN, 1, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP ), // information type dropdown + MakeWidget({250, 60}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP ), // information type dropdown button + MakeWidget({273, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_GUESTS_ON_MAP_TIP ), // map + MakeWidget({297, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_SEARCH, STR_GUESTS_FILTER_BY_NAME_TIP), // filter by name + MakeWidget({321, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_TRACK_PEEP, STR_TRACKED_GUESTS_ONLY_TIP ), // tracking + MakeTab ({ 3, 17}, STR_INDIVIDUAL_GUESTS_TIP ), // tab 1 + MakeTab ({ 34, 17}, STR_SUMMARISED_GUESTS_TIP ), // tab 2 + MakeWidget({ 3, 72}, {344, 255}, WWT_SCROLL, 1, SCROLL_BOTH ), // guest list { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 1b13f1636f..24cec8157b 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -116,11 +116,11 @@ static constexpr const int32_t WH = 273; #define SHARED_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), /* WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE */ \ - MakeWidget ({ 0, 43}, {WW, 229}, WWT_RESIZE, 1 ), /* WIDX_PAGE_BACKGROUND */ \ - MakeRemapWidget({ 3, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB), /* WIDX_TAB_1 */ \ - MakeRemapWidget({34, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB), /* WIDX_TAB_2 */ \ - MakeRemapWidget({65, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB), /* WIDX_TAB_3 */ \ - MakeRemapWidget({96, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB) /* WIDX_TAB_4 */ + MakeWidget({ 0, 43}, {WW, 229}, WWT_RESIZE, 1), /* WIDX_PAGE_BACKGROUND */ \ + MakeTab ({ 3, 17} ), /* WIDX_TAB_1 */ \ + MakeTab ({34, 17} ), /* WIDX_TAB_2 */ \ + MakeTab ({65, 17} ), /* WIDX_TAB_3 */ \ + MakeTab ({96, 17} ) /* WIDX_TAB_4 */ static rct_widget MapWidgets[] = { SHARED_WIDGETS, diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 185b01448a..3d9d6920c3 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -58,14 +58,14 @@ enum WINDOW_MULTIPLAYER_WIDGET_IDX { }; #define MAIN_MULTIPLAYER_WIDGETS \ - MakeWidget ({ 0, 0}, {340, 240}, WWT_FRAME, 0 ), /* panel / background */ \ - MakeWidget ({ 1, 1}, {338, 14}, WWT_CAPTION, 0, STR_NONE, STR_WINDOW_TITLE_TIP ), /* title bar */ \ - MakeWidget ({327, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), /* close x button */ \ - MakeWidget ({ 0, 43}, {340, 197}, WWT_RESIZE, 1 ), /* content panel */ \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_SERVER_INFO_TIP), /* tab */ \ - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_PLAYERS_TIP ), /* tab */ \ - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_GROUPS_TIP ), /* tab */ \ - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_TIP ) /* tab */ + MakeWidget({ 0, 0}, {340, 240}, WWT_FRAME, 0 ), /* panel / background */ \ + MakeWidget({ 1, 1}, {338, 14}, WWT_CAPTION, 0, STR_NONE, STR_WINDOW_TITLE_TIP ), /* title bar */ \ + MakeWidget({327, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), /* close x button */ \ + MakeWidget({ 0, 43}, {340, 197}, WWT_RESIZE, 1 ), /* content panel */ \ + MakeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP), /* tab */ \ + MakeTab ({ 34, 17}, STR_PLAYERS_TIP ), /* tab */ \ + MakeTab ({ 65, 17}, STR_GROUPS_TIP ), /* tab */ \ + MakeTab ({ 96, 17}, STR_OPTIONS_TIP ) /* tab */ static rct_widget window_multiplayer_information_widgets[] = { MAIN_MULTIPLAYER_WIDGETS, diff --git a/src/openrct2-ui/windows/Network.cpp b/src/openrct2-ui/windows/Network.cpp index ad7778c7f1..1151de82ab 100644 --- a/src/openrct2-ui/windows/Network.cpp +++ b/src/openrct2-ui/windows/Network.cpp @@ -39,8 +39,8 @@ enum WINDOW_NETWORK_WIDGET_IDX { static rct_widget window_network_information_widgets[] = { WINDOW_SHIM(STR_NONE, WW, WH), - MakeWidget ({ 0, 43}, {450, 167}, WWT_RESIZE, 1 ), // content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOW_SERVER_INFO_TIP), // tab + MakeWidget({ 0, 43}, {450, 167}, WWT_RESIZE, 1), // content panel + MakeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP ), // tab { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 9ac13b8f57..55cf8591ac 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -187,19 +187,19 @@ enum { static rct_widget window_new_ride_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {601, 339}, WWT_RESIZE, 1 ), - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TRANSPORT_RIDES_TIP ), - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_GENTLE_RIDES_TIP ), - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_ROLLER_COASTERS_TIP ), - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THRILL_RIDES_TIP ), - MakeRemapWidget({127, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_WATER_RIDES_TIP ), - MakeRemapWidget({158, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_SHOPS_STALLS_TIP ), - MakeRemapWidget({189, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP), - MakeWidget ({ 3, 46}, {595, 272}, WWT_SCROLL, 1, SCROLL_VERTICAL ), - MakeWidget ({ 3, 47}, {290, 70}, WWT_GROUPBOX, 2, STR_CURRENTLY_IN_DEVELOPMENT ), - MakeWidget ({ 3, 124}, {290, 65}, WWT_GROUPBOX, 2, STR_LAST_DEVELOPMENT ), - MakeWidget ({265, 161}, { 24, 24}, WWT_FLATBTN, 2, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ), - MakeWidget ({265, 68}, { 24, 24}, WWT_FLATBTN, 2, SPR_FINANCE, STR_FINANCES_RESEARCH_TIP ), + MakeWidget({ 0, 43}, {601, 339}, WWT_RESIZE, 1 ), + MakeTab ({ 3, 17}, STR_TRANSPORT_RIDES_TIP ), + MakeTab ({ 34, 17}, STR_GENTLE_RIDES_TIP ), + MakeTab ({ 65, 17}, STR_ROLLER_COASTERS_TIP ), + MakeTab ({ 96, 17}, STR_THRILL_RIDES_TIP ), + MakeTab ({127, 17}, STR_WATER_RIDES_TIP ), + MakeTab ({158, 17}, STR_SHOPS_STALLS_TIP ), + MakeTab ({189, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP), + MakeWidget({ 3, 46}, {595, 272}, WWT_SCROLL, 1, SCROLL_VERTICAL ), + MakeWidget({ 3, 47}, {290, 70}, WWT_GROUPBOX, 2, STR_CURRENTLY_IN_DEVELOPMENT ), + MakeWidget({ 3, 124}, {290, 65}, WWT_GROUPBOX, 2, STR_LAST_DEVELOPMENT ), + MakeWidget({265, 161}, { 24, 24}, WWT_FLATBTN, 2, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ), + MakeWidget({265, 68}, { 24, 24}, WWT_FLATBTN, 2, SPR_FINANCE, STR_FINANCES_RESEARCH_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 6c64223d04..9cefa65205 100644 --- a/src/openrct2-ui/windows/NewsOptions.cpp +++ b/src/openrct2-ui/windows/NewsOptions.cpp @@ -67,19 +67,19 @@ enum WINDOW_NEWS_WIDGET_IDX { static rct_widget window_news_options_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {400, 257}, WWT_RESIZE, 1 ), // tab content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB), // tab 1 - MakeRemapWidget({34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB), // tab 2 - MakeRemapWidget({65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB), // tab 2 - MakeWidget ({ 7, 49}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), - MakeWidget ({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2 ), + MakeWidget({ 0, 43}, {400, 257}, WWT_RESIZE, 1), // tab content panel + MakeTab ({ 3, 17} ), // tab 1 + MakeTab ({34, 17} ), // tab 2 + MakeTab ({65, 17} ), // tab 2 + MakeWidget({ 7, 49}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, 2), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index af5fa99339..40365a0c48 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -194,14 +194,14 @@ static constexpr const int32_t WH = 332; #define MAIN_OPTIONS_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {WW, 289}, WWT_RESIZE, 1), \ - MakeRemapWidget({ 3, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_DISPLAY_TIP ), \ - MakeRemapWidget({ 34, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_RENDERING_TIP ), \ - MakeRemapWidget({ 65, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_CULTURE_TIP ), \ - MakeRemapWidget({ 96, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_AUDIO_TIP ), \ - MakeRemapWidget({127, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_CONTROLS_AND_INTERFACE_TIP), \ - MakeRemapWidget({158, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_MISCELLANEOUS_TIP ), \ - MakeRemapWidget({189, 17}, {31, 27}, WWT_TAB, 1, SPR_TAB, STR_OPTIONS_ADVANCED ) + MakeWidget({ 0, 43}, {WW, 289}, WWT_RESIZE, 1 ), \ + MakeTab ({ 3, 17}, STR_OPTIONS_DISPLAY_TIP ), \ + MakeTab ({ 34, 17}, STR_OPTIONS_RENDERING_TIP ), \ + MakeTab ({ 65, 17}, STR_OPTIONS_CULTURE_TIP ), \ + MakeTab ({ 96, 17}, STR_OPTIONS_AUDIO_TIP ), \ + MakeTab ({127, 17}, STR_OPTIONS_CONTROLS_AND_INTERFACE_TIP), \ + MakeTab ({158, 17}, STR_OPTIONS_MISCELLANEOUS_TIP ), \ + MakeTab ({189, 17}, STR_OPTIONS_ADVANCED ) static rct_widget window_options_display_widgets[] = { MAIN_OPTIONS_WIDGETS, 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..10dd4f34d0 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 ffdf94a576..81994f08a8 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 }, }; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 61f16433fc..d476ef5549 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -156,25 +156,25 @@ validate_global_widx(WC_SCENERY, WIDX_SCENERY_EYEDROPPER_BUTTON); static rct_widget window_scenery_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT), MakeWidget ({ 0, 43}, {634, 99}, WWT_RESIZE, 1 ), // 8 0x009DE2C8 - MakeWidget ({ 3, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 10 0x009DE2D8 - MakeWidget ({ 34, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 20 0x009DE2E8 - MakeWidget ({ 65, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 40 0x009DE2F8 - MakeWidget ({ 96, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 80 0x009DE308 - MakeWidget ({127, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 100 0x009DE318 - MakeWidget ({158, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 200 0x009DE328 - MakeWidget ({189, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 400 0x009DE338 - MakeWidget ({220, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 800 0x009DE348 - MakeWidget ({251, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 1000 0x009DE358 - MakeWidget ({282, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 2000 0x009DE368 - MakeWidget ({313, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 4000 0x009DE378 - MakeWidget ({344, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 8000 0x009DE388 - MakeWidget ({375, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 10000 0x009DE398 - MakeWidget ({406, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 20000 0x009DE3A8 - MakeWidget ({437, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 40000 0x009DE3B8 - MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 80000 0x009DE3C8 - MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 100000 0x009DE3D8 - MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 200000 0x009DE3E8 - MakeWidget ({468, 17}, { 31, 27}, WWT_TAB, 1, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP ), // 400000 0x009DE3F8 + MakeTab ({ 3, 17}, STR_STRING_DEFINED_TOOLTIP ), // 10 0x009DE2D8 + MakeTab ({ 34, 17}, STR_STRING_DEFINED_TOOLTIP ), // 20 0x009DE2E8 + MakeTab ({ 65, 17}, STR_STRING_DEFINED_TOOLTIP ), // 40 0x009DE2F8 + MakeTab ({ 96, 17}, STR_STRING_DEFINED_TOOLTIP ), // 80 0x009DE308 + MakeTab ({127, 17}, STR_STRING_DEFINED_TOOLTIP ), // 100 0x009DE318 + MakeTab ({158, 17}, STR_STRING_DEFINED_TOOLTIP ), // 200 0x009DE328 + MakeTab ({189, 17}, STR_STRING_DEFINED_TOOLTIP ), // 400 0x009DE338 + MakeTab ({220, 17}, STR_STRING_DEFINED_TOOLTIP ), // 800 0x009DE348 + MakeTab ({251, 17}, STR_STRING_DEFINED_TOOLTIP ), // 1000 0x009DE358 + MakeTab ({282, 17}, STR_STRING_DEFINED_TOOLTIP ), // 2000 0x009DE368 + MakeTab ({313, 17}, STR_STRING_DEFINED_TOOLTIP ), // 4000 0x009DE378 + MakeTab ({344, 17}, STR_STRING_DEFINED_TOOLTIP ), // 8000 0x009DE388 + MakeTab ({375, 17}, STR_STRING_DEFINED_TOOLTIP ), // 10000 0x009DE398 + MakeTab ({406, 17}, STR_STRING_DEFINED_TOOLTIP ), // 20000 0x009DE3A8 + MakeTab ({437, 17}, STR_STRING_DEFINED_TOOLTIP ), // 40000 0x009DE3B8 + MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 80000 0x009DE3C8 + MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 100000 0x009DE3D8 + MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 200000 0x009DE3E8 + MakeTab ({468, 17}, STR_STRING_DEFINED_TOOLTIP ), // 400000 0x009DE3F8 MakeRemapWidget({468, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB_QUESTION, STR_STRING_DEFINED_TOOLTIP ), // 800000 0x009DE408 MakeWidget ({ 2, 47}, {607, 80}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // 1000000 0x009DE418 MakeWidget ({609, 44}, { 24, 24}, WWT_FLATBTN, 1, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 ), // 2000000 0x009DE428 diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 70845380ce..6601faaed3 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -72,10 +72,10 @@ validate_global_widx(WC_STAFF, WIDX_PICKUP); #define MAIN_STAFF_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - MakeWidget ({ 0, 43}, {190, 137}, WWT_RESIZE, 1 ), /* Resize */ \ - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_OVERVIEW_TIP), /* Tab 1 */ \ - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_OPTIONS_TIP ), /* Tab 2 */ \ - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_STATS_TIP ) /* Tab 3 */ + MakeWidget({ 0, 43}, {190, 137}, WWT_RESIZE, 1), /* Resize */ \ + MakeTab ({ 3, 17}, STR_STAFF_OVERVIEW_TIP ), /* Tab 1 */ \ + MakeTab ({34, 17}, STR_STAFF_OPTIONS_TIP ), /* Tab 2 */ \ + MakeTab ({65, 17}, STR_STAFF_STATS_TIP ) /* Tab 3 */ static rct_widget window_staff_overview_widgets[] = { MAIN_STAFF_WIDGETS, diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 70404d5393..ac52983f63 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -112,17 +112,17 @@ constexpr int32_t MAX_WH = 450; static rct_widget window_staff_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, { WW, WH - 43}, WWT_RESIZE, 1 ), // tab content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_HANDYMEN_TAB_TIP ), // handymen tab - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_MECHANICS_TAB_TIP ), // mechanics tab - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_SECURITY_TAB_TIP ), // security guards tab - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STAFF_ENTERTAINERS_TAB_TIP), // entertainers tab - MakeWidget ({ 3, 72}, {WW - 6, 195}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list - MakeWidget ({130, 58}, { 12, 12}, WWT_COLOURBTN, 1, STR_NONE, STR_UNIFORM_COLOUR_TIP ), // uniform colour picker - MakeWidget ({165, 17}, { 145, 13}, WWT_BUTTON, 0, STR_NONE, STR_HIRE_STAFF_TIP ), // hire button - MakeWidget ({243, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF ), // quick fire staff - MakeWidget ({267, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool - MakeWidget ({291, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_STAFF_ON_MAP_TIP ), // show staff on map button + MakeWidget({ 0, 43}, { WW, WH - 43}, WWT_RESIZE, 1 ), // tab content panel + MakeTab ({ 3, 17}, STR_STAFF_HANDYMEN_TAB_TIP ), // handymen tab + MakeTab ({ 34, 17}, STR_STAFF_MECHANICS_TAB_TIP ), // mechanics tab + MakeTab ({ 65, 17}, STR_STAFF_SECURITY_TAB_TIP ), // security guards tab + MakeTab ({ 96, 17}, STR_STAFF_ENTERTAINERS_TAB_TIP), // entertainers tab + MakeWidget({ 3, 72}, {WW - 6, 195}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list + MakeWidget({130, 58}, { 12, 12}, WWT_COLOURBTN, 1, STR_NONE, STR_UNIFORM_COLOUR_TIP ), // uniform colour picker + MakeWidget({165, 17}, { 145, 13}, WWT_BUTTON, 0, STR_NONE, STR_HIRE_STAFF_TIP ), // hire button + MakeWidget({243, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF ), // quick fire staff + MakeWidget({267, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool + MakeWidget({291, 46}, { 24, 24}, WWT_FLATBTN, 1, SPR_MAP, STR_SHOW_STAFF_ON_MAP_TIP ), // show staff on map button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index a7cec987bd..e74c183c51 100644 --- a/src/openrct2-ui/windows/Themes.cpp +++ b/src/openrct2-ui/windows/Themes.cpp @@ -115,29 +115,29 @@ static constexpr const int32_t WH = 107; static rct_widget window_themes_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {320, 64}, WWT_RESIZE, 1 ), // tab content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP ), // settings tab - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_MAIN_TIP ), // main ui tab - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_PARK_TIP ), // park tab - MakeRemapWidget({ 96, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_TOOLS_TIP ), // tools tab - MakeRemapWidget({127, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_RIDES_AND_GUESTS_TIP), // rides and peeps tab - MakeRemapWidget({158, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_EDITORS_TIP ), // editors tab - MakeRemapWidget({189, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_MISC_TIP ), // misc tab - MakeRemapWidget({220, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_PROMPTS_TIP ), // prompts tab - MakeRemapWidget({251, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_FEATURES_TIP ), // features tab - MakeWidget ({ 5, 46}, {214, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_WINDOW ), // Window header - MakeWidget ({219, 46}, { 97, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_PALETTE ), // Palette header - MakeWidget ({125, 60}, {175, 12}, WWT_DROPDOWN, 1 ), // Preset colour schemes - MakeWidget ({288, 61}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - MakeWidget ({ 10, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP ), // Duplicate button - MakeWidget ({110, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button - MakeWidget ({210, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button - MakeWidget ({ 0, 0}, { 1, 1}, WWT_COLOURBTN, 1 ), // colour button mask - MakeWidget ({ 3, 60}, {314, 44}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list - MakeWidget ({ 10, 54}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights - MakeWidget ({ 10, 69}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights - MakeWidget ({ 10, 84}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font - MakeWidget ({ 10, 99}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ), // rct1 bottom toolbar + MakeWidget({ 0, 43}, {320, 64}, WWT_RESIZE, 1 ), // tab content panel + MakeTab ({ 3, 17}, STR_THEMES_TAB_SETTINGS_TIP ), // settings tab + MakeTab ({ 34, 17}, STR_THEMES_TAB_MAIN_TIP ), // main ui tab + MakeTab ({ 65, 17}, STR_THEMES_TAB_PARK_TIP ), // park tab + MakeTab ({ 96, 17}, STR_THEMES_TAB_TOOLS_TIP ), // tools tab + MakeTab ({127, 17}, STR_THEMES_TAB_RIDES_AND_GUESTS_TIP), // rides and peeps tab + MakeTab ({158, 17}, STR_THEMES_TAB_EDITORS_TIP ), // editors tab + MakeTab ({189, 17}, STR_THEMES_TAB_MISC_TIP ), // misc tab + MakeTab ({220, 17}, STR_THEMES_TAB_PROMPTS_TIP ), // prompts tab + MakeTab ({251, 17}, STR_THEMES_TAB_FEATURES_TIP ), // features tab + MakeWidget({ 5, 46}, {214, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_WINDOW ), // Window header + MakeWidget({219, 46}, { 97, 15}, WWT_TABLE_HEADER, 1, STR_THEMES_HEADER_PALETTE ), // Palette header + MakeWidget({125, 60}, {175, 12}, WWT_DROPDOWN, 1 ), // Preset colour schemes + MakeWidget({288, 61}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeWidget({ 10, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP ), // Duplicate button + MakeWidget({110, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button + MakeWidget({210, 82}, { 91, 12}, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button + MakeWidget({ 0, 0}, { 1, 1}, WWT_COLOURBTN, 1 ), // colour button mask + MakeWidget({ 3, 60}, {314, 44}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // staff list + MakeWidget({ 10, 54}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights + MakeWidget({ 10, 69}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights + MakeWidget({ 10, 84}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font + MakeWidget({ 10, 99}, {290, 12}, WWT_CHECKBOX, 1, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ), // rct1 bottom toolbar { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index b436999bdb..28fc992804 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -148,11 +148,11 @@ static constexpr int32_t SCROLL_WIDTH = 350; static rct_widget window_title_editor_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, { 320, 84}, WWT_RESIZE, 1 ), // tab content panel - MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_THEMES_TAB_SETTINGS_TIP ), // presets tab - MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TITLE_EDITOR_SAVES_TAB_TIP ), // saves tab - MakeRemapWidget({ 65, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_TITLE_EDITOR_SCRIPT_TAB_TIP ), // script tab - MakeWidget ({ 89, 48}, { 228, 219}, WWT_SCROLL, 1, SCROLL_BOTH ), // command/save list + MakeWidget({ 0, 43}, { 320, 84}, WWT_RESIZE, 1 ), // tab content panel + MakeTab ({ 3, 17}, STR_THEMES_TAB_SETTINGS_TIP ), // presets tab + MakeTab ({ 34, 17}, STR_TITLE_EDITOR_SAVES_TAB_TIP ), // saves tab + MakeTab ({ 65, 17}, STR_TITLE_EDITOR_SCRIPT_TAB_TIP ), // script tab + MakeWidget({ 89, 48}, { 228, 219}, WWT_SCROLL, 1, SCROLL_BOTH), // command/save list // Presets Tab MakeWidget ({ 125, 60}, { 175, 14}, WWT_DROPDOWN, 1 ), // Preset title sequences diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index ae289874f1..9d0fbf6a8d 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -61,6 +61,8 @@ enum constexpr uint8_t SCROLLBAR_WIDTH = 10; +constexpr const ScreenSize TAB_SIZE = { 31, 27 }; + constexpr rct_widget MakeWidget( const ScreenCoordsXY& origin, const ScreenSize& size, uint8_t type, uint8_t colour, uint32_t content = 0xFFFFFFFF, rct_string_id tooltip = STR_NONE) @@ -85,6 +87,16 @@ constexpr rct_widget MakeRemapWidget( return MakeWidget(origin, size, type, colour, IMAGE_TYPE_REMAP | content, tooltip); } +constexpr rct_widget MakeTab(const ScreenCoordsXY& origin, rct_string_id tooltip = STR_NONE) +{ + const ScreenSize size = TAB_SIZE; + const uint8_t type = WWT_TAB; + const uint8_t colour = 1; + const uint32_t content = 0xFFFFFFFF; + + return MakeWidget(origin, size, type, colour, content, tooltip); +} + #define MakeSpinnerWidgets(...) \ MakeWidget(__VA_ARGS__), MakeSpinnerIncreaseWidget(__VA_ARGS__), MakeSpinnerDecreaseWidget(__VA_ARGS__) diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 089cd6a4c7..80a066e080 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -635,8 +635,8 @@ enum SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NW_SE_PART_0_2 = SPR_G2_BEGIN + 55, SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_CHAIN_NE_SW_PART_0_2 = SPR_G2_BEGIN + 56, - SPR_JUNIOR_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 84, - SPR_JUNIOR_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 85, + SPR_JUNIOR_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 83, + SPR_JUNIOR_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 84, }; static constexpr const uint32_t junior_rc_track_pieces_flat[3][4] = { diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 7adcd3011a..6fd4fcd557 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -787,24 +787,23 @@ enum SPR_G2_SORT = SPR_G2_BEGIN + 76, SPR_G2_COPY = SPR_G2_BEGIN + 77, SPR_G2_PASTE = SPR_G2_BEGIN + 78, - SPR_G2_TAB_DISABLED = SPR_G2_BEGIN + 79, - SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 80, - SPR_G2_GIGA_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 81, - SPR_G2_BM_BOOSTER_NE_SW = SPR_G2_BEGIN + 82, - SPR_G2_BM_BOOSTER_NW_SE = SPR_G2_BEGIN + 83, + SPR_G2_GIGA_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 79, + SPR_G2_GIGA_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 80, + SPR_G2_BM_BOOSTER_NE_SW = SPR_G2_BEGIN + 81, + SPR_G2_BM_BOOSTER_NW_SE = SPR_G2_BEGIN + 82, - SPR_G2_TOOLBAR_MUTE = SPR_G2_BEGIN + 86, - SPR_G2_TOOLBAR_MUTE_PRESSED = SPR_G2_BEGIN + 87, - SPR_G2_TOOLBAR_UNMUTE = SPR_G2_BEGIN + 88, - SPR_G2_TOOLBAR_UNMUTE_PRESSED = SPR_G2_BEGIN + 89, + SPR_G2_TOOLBAR_MUTE = SPR_G2_BEGIN + 85, + SPR_G2_TOOLBAR_MUTE_PRESSED = SPR_G2_BEGIN + 86, + SPR_G2_TOOLBAR_UNMUTE = SPR_G2_BEGIN + 87, + SPR_G2_TOOLBAR_UNMUTE_PRESSED = SPR_G2_BEGIN + 88, - SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 90, - SPR_G2_MINI_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 91, + SPR_G2_MINI_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 89, + SPR_G2_MINI_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 90, - SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3 = SPR_G2_BEGIN + 92, + SPR_G2_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_3 = SPR_G2_BEGIN + 91, - SPR_G2_MINIATURE_RAILWAY_BEGIN = SPR_G2_BEGIN + 93, + SPR_G2_MINIATURE_RAILWAY_BEGIN = SPR_G2_BEGIN + 92, SPR_G2_MINIATURE_RAILWAY_GRAVEL_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 0, SPR_G2_MINIATURE_RAILWAY_GRAVEL_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 1, SPR_G2_MINIATURE_RAILWAY_GROOVED_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 2, @@ -817,53 +816,53 @@ enum SPR_G2_MINIATURE_RAILWAY_INSET_END_SW = SPR_G2_MINIATURE_RAILWAY_BEGIN + 9, SPR_G2_MINIATURE_RAILWAY_INSET_END_SW_NE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 10, SPR_G2_MINIATURE_RAILWAY_INSET_END_NW_SE = SPR_G2_MINIATURE_RAILWAY_BEGIN + 11, - SPR_G2_MINIATURE_RAILWAY_LAST = SPR_G2_BEGIN + 104, + SPR_G2_MINIATURE_RAILWAY_LAST = SPR_G2_BEGIN + 103, - SPR_G2_SEARCH = SPR_G2_BEGIN + 105, + SPR_G2_SEARCH = SPR_G2_BEGIN + 104, - SPR_G2_SURFACE_GLASSY_RECOLOURABLE = SPR_G2_BEGIN + 106, + SPR_G2_SURFACE_GLASSY_RECOLOURABLE = SPR_G2_BEGIN + 105, - SPR_G2_SELECTION_EDGE_NW = SPR_G2_BEGIN + 107, - SPR_G2_SELECTION_EDGE_NE = SPR_G2_BEGIN + 108, - SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 109, - SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 110, + SPR_G2_SELECTION_EDGE_NW = SPR_G2_BEGIN + 106, + SPR_G2_SELECTION_EDGE_NE = SPR_G2_BEGIN + 107, + SPR_G2_SELECTION_EDGE_SW = SPR_G2_BEGIN + 108, + SPR_G2_SELECTION_EDGE_SE = SPR_G2_BEGIN + 109, - SPR_G2_EYEDROPPER = SPR_G2_BEGIN + 111, - SPR_G2_CHAT = SPR_G2_BEGIN + 112, + SPR_G2_EYEDROPPER = SPR_G2_BEGIN + 110, + SPR_G2_CHAT = SPR_G2_BEGIN + 111, - SPR_G2_MAP_NORTH = SPR_G2_BEGIN + 113, - SPR_G2_MAP_NORTH_PRESSED = SPR_G2_BEGIN + 114, - SPR_G2_MAP_WEST = SPR_G2_BEGIN + 115, - SPR_G2_MAP_WEST_PRESSED = SPR_G2_BEGIN + 116, - SPR_G2_MAP_SOUTH = SPR_G2_BEGIN + 117, - SPR_G2_MAP_SOUTH_PRESSED = SPR_G2_BEGIN + 118, - SPR_G2_MAP_EAST = SPR_G2_BEGIN + 119, - SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 120, + SPR_G2_MAP_NORTH = SPR_G2_BEGIN + 112, + SPR_G2_MAP_NORTH_PRESSED = SPR_G2_BEGIN + 113, + SPR_G2_MAP_WEST = SPR_G2_BEGIN + 114, + SPR_G2_MAP_WEST_PRESSED = SPR_G2_BEGIN + 115, + SPR_G2_MAP_SOUTH = SPR_G2_BEGIN + 116, + SPR_G2_MAP_SOUTH_PRESSED = SPR_G2_BEGIN + 117, + SPR_G2_MAP_EAST = SPR_G2_BEGIN + 118, + SPR_G2_MAP_EAST_PRESSED = SPR_G2_BEGIN + 119, - SPR_G2_TOOLBAR_MULTIPLAYER = SPR_G2_BEGIN + 121, - SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED = SPR_G2_BEGIN + 122, - SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 123, - SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 124, + SPR_G2_TOOLBAR_MULTIPLAYER = SPR_G2_BEGIN + 120, + SPR_G2_TOOLBAR_MULTIPLAYER_PRESSED = SPR_G2_BEGIN + 121, + SPR_G2_MULTIPLAYER_SYNC = SPR_G2_BEGIN + 122, + SPR_G2_MULTIPLAYER_DESYNC = SPR_G2_BEGIN + 123, - SPR_G2_SIMULATE = SPR_G2_BEGIN + 125, - SPR_G2_RCT1_SIMULATE_BUTTON_0 = SPR_G2_BEGIN + 126, - SPR_G2_RCT1_SIMULATE_BUTTON_1 = SPR_G2_BEGIN + 127, - SPR_G2_RCT1_SIMULATE_BUTTON_2 = SPR_G2_BEGIN + 128, - SPR_G2_RCT1_SIMULATE_BUTTON_3 = SPR_G2_BEGIN + 129, + SPR_G2_SIMULATE = SPR_G2_BEGIN + 124, + SPR_G2_RCT1_SIMULATE_BUTTON_0 = SPR_G2_BEGIN + 125, + SPR_G2_RCT1_SIMULATE_BUTTON_1 = SPR_G2_BEGIN + 126, + SPR_G2_RCT1_SIMULATE_BUTTON_2 = SPR_G2_BEGIN + 127, + SPR_G2_RCT1_SIMULATE_BUTTON_3 = SPR_G2_BEGIN + 128, - SPR_G2_LAND_TOOL_SIZE_6 = SPR_G2_BEGIN + 130, + SPR_G2_LAND_TOOL_SIZE_6 = SPR_G2_BEGIN + 129, - SPR_G2_MOUNTAIN_TOOL_EVEN = SPR_G2_BEGIN + 131, - SPR_G2_MOUNTAIN_TOOL_ODD = SPR_G2_BEGIN + 132, + SPR_G2_MOUNTAIN_TOOL_EVEN = SPR_G2_BEGIN + 130, + SPR_G2_MOUNTAIN_TOOL_ODD = SPR_G2_BEGIN + 131, - SPR_G2_SCENERY_SCATTER_LOW = SPR_G2_BEGIN + 133, - SPR_G2_SCENERY_SCATTER_MEDIUM = SPR_G2_BEGIN + 134, - SPR_G2_SCENERY_SCATTER_HIGH = SPR_G2_BEGIN + 135, + SPR_G2_SCENERY_SCATTER_LOW = SPR_G2_BEGIN + 132, + SPR_G2_SCENERY_SCATTER_MEDIUM = SPR_G2_BEGIN + 133, + SPR_G2_SCENERY_SCATTER_HIGH = SPR_G2_BEGIN + 134, - SPR_G2_WOODEN_RC_BOOSTER_SW_NE = SPR_G2_BEGIN + 136, - SPR_G2_WOODEN_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 137, + SPR_G2_WOODEN_RC_BOOSTER_SW_NE = SPR_G2_BEGIN + 135, + SPR_G2_WOODEN_RC_BOOSTER_NW_SE = SPR_G2_BEGIN + 136, - SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 138, + SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 137, SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN, SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,