From 3631d75b987ff9dca0367c5c5d3a4b207f21cb89 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Mon, 17 Aug 2020 17:51:14 +0200 Subject: [PATCH] Use MakeTab in Mapgen, Multiplayer, Network, NewRide, NewsOptions --- src/openrct2-ui/windows/MapGen.cpp | 10 +++++----- src/openrct2-ui/windows/Multiplayer.cpp | 16 +++++++-------- src/openrct2-ui/windows/Network.cpp | 4 ++-- src/openrct2-ui/windows/NewRide.cpp | 26 ++++++++++++------------- src/openrct2-ui/windows/NewsOptions.cpp | 26 ++++++++++++------------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 1b13f1636f..2d9a56ea9f 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..aaf54e2cc4 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..5c790e5154 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..f97e555845 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 }, };