From 40cfadcdc5a8e2f290a2566bf622f68946543041 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 18 Aug 2020 09:44:14 +0200 Subject: [PATCH] Apply formatting suggestions from code review Co-authored-by: Tulio Leao --- src/openrct2-ui/windows/MapGen.cpp | 8 ++++---- src/openrct2-ui/windows/Multiplayer.cpp | 8 ++++---- src/openrct2-ui/windows/Network.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 26 ++++++++++++------------- src/openrct2-ui/windows/Options.cpp | 2 +- src/openrct2-ui/windows/Research.cpp | 12 ++++++------ 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 2d9a56ea9f..24cec8157b 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -117,10 +117,10 @@ 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 */ \ - MakeTab ({ 3, 17}), /* WIDX_TAB_1 */ \ - MakeTab ({34, 17}), /* WIDX_TAB_2 */ \ - MakeTab ({65, 17}), /* WIDX_TAB_3 */ \ - MakeTab ({96, 17}) /* WIDX_TAB_4 */ + 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 aaf54e2cc4..3d9d6920c3 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -62,10 +62,10 @@ enum WINDOW_MULTIPLAYER_WIDGET_IDX { 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 */ + 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 5c790e5154..1151de82ab 100644 --- a/src/openrct2-ui/windows/Network.cpp +++ b/src/openrct2-ui/windows/Network.cpp @@ -40,7 +40,7 @@ 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 - MakeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP), // tab + 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 f97e555845..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 ), - 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 ), + 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/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 15b0a14015..d3182e8566 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -194,7 +194,7 @@ 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), \ + 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 ), \ diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 7bc182f765..10dd4f34d0 100644 --- a/src/openrct2-ui/windows/Research.cpp +++ b/src/openrct2-ui/windows/Research.cpp @@ -62,9 +62,9 @@ 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), - MakeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), - MakeTab ({ 34, 17}, STR_FINANCES_RESEARCH_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 ), @@ -73,9 +73,9 @@ static rct_widget window_research_development_widgets[] = { 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), - MakeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), - MakeTab ({ 34, 17}, STR_FINANCES_RESEARCH_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),