mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor more widgets definitions into new format 

* About
* Editor Bottom Toolbar
* Editor Inventions List
* Editor Object Selection
* Error
* Finances
* Footpath
* Game Bottom Toolbar
* Guest List
* Network Status
* News
* News Options
* Player
* Research
* Staff List
* Title Options
* About window.

And fix MakeSpinnerWidgets declaration order.
This commit is contained in:
Aaron van Geffen 2020-07-16 20:48:25 +02:00 committed by GitHub
parent 31efe32ade
commit 79ae0786c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 171 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2-ui/windows/About.cpp
View File

@ -47,19 +47,19 @@ enum WINDOW_ABOUT_WIDGET_IDX {
#define WIDGETS_MAIN \
WINDOW_SHIM(WINDOW_TITLE, WW, WH), \
{ WWT_IMGBTN, 1, 0, WW - 1, TABHEIGHT, WH - 1, 0xFFFFFFFF, STR_NONE }, /* page background */ \
{ WWT_TAB, 1, 3, 93, 17, TABHEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE }, /* about OpenRCT2 button */ \
{ WWT_TAB, 1, 94, 184, 17, TABHEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE } /* about RCT2 button */
MakeWidget ({ 0, TABHEIGHT}, {WW, WH - TABHEIGHT}, WWT_IMGBTN, 1 ), /* page background */ \
MakeRemapWidget({ 3, 17}, {91, TABHEIGHT - 16}, WWT_TAB, 1, SPR_TAB_LARGE), /* about OpenRCT2 button */ \
MakeRemapWidget({94, 17}, {91, TABHEIGHT - 16}, WWT_TAB, 1, SPR_TAB_LARGE) /* about RCT2 button */
static rct_widget window_about_openrct2_widgets[] = {
WIDGETS_MAIN,
{ WWT_BUTTON, 1, 100, 299, WH - 50, WH - 39, STR_CHANGELOG_ELLIPSIS, STR_NONE }, // changelog button
MakeWidget({100, WH - TABHEIGHT}, {200, 12}, WWT_BUTTON, 1, STR_CHANGELOG_ELLIPSIS), // changelog button
{ WIDGETS_END }
};
static rct_widget window_about_rct2_widgets[] = {
WIDGETS_MAIN,
{ WWT_BUTTON, 1, 100, 299, WH - 50, WH - 39, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS, STR_NONE }, // music credits button
MakeWidget({100, WH - TABHEIGHT}, {200, 12}, WWT_BUTTON, 1, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS), // music credits button
{ WIDGETS_END },
};

8
src/openrct2-ui/windows/EditorBottomToolbar.cpp
View File

@ -36,10 +36,10 @@ enum {
};
static rct_widget window_editor_bottom_toolbar_widgets[] = {
{ WWT_IMGBTN, 0, 0, 199, 0, 33, 0xFFFFFFFF, 0xFFFF }, // 1 0x9A9958
{ WWT_FLATBTN, 0, 2, 197, 2, 31, 0xFFFFFFFF, 0xFFFF }, // 2 0x9A9968
{ WWT_IMGBTN, 0, 440, 639, 0, 33, 0xFFFFFFFF, 0xFFFF }, // 4 0x9A9978
{ WWT_FLATBTN, 0, 442, 637, 2, 31, 0xFFFFFFFF, 0xFFFF }, // 8 0x9A9988
MakeWidget({ 0, 0}, {200, 34}, WWT_IMGBTN, 0),
MakeWidget({ 2, 2}, {196, 30}, WWT_FLATBTN, 0),
MakeWidget({440, 0}, {200, 34}, WWT_IMGBTN, 0),
MakeWidget({442, 2}, {196, 30}, WWT_FLATBTN, 0),
{ WIDGETS_END },
};

18
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -47,19 +47,19 @@ enum {
static rct_widget window_editor_inventions_list_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 599, 43, 399, STR_NONE, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE },
{ WWT_SCROLL, 1, 4, 371, 56, 216, SCROLL_VERTICAL, STR_NONE },
{ WWT_SCROLL, 1, 4, 371, 231, 387, SCROLL_VERTICAL, STR_NONE },
{ WWT_FLATBTN, 1, 431, 544, 106, 219, 0xFFFFFFFF, STR_NONE },
{ WWT_BUTTON, 1, 375, 594, 343, 356, STR_MOVE_ALL_TOP, STR_NONE },
{ WWT_BUTTON, 1, 375, 594, 358, 371, STR_MOVE_ALL_BOTTOM, STR_NONE },
{ WWT_BUTTON, 1, 375, 594, 373, 386, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP },
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),
{ WIDGETS_END }
};
static rct_widget window_editor_inventions_list_drag_widgets[] = {
{ WWT_IMGBTN, 0, 0, 149, 0, 13, STR_NONE, STR_NONE },
MakeWidget({0, 0}, {150, 14}, WWT_IMGBTN, 0),
{ WIDGETS_END }
};

38
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -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<rct_widget> _window_editor_object_selection_widgets = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 599, 43, 399, 0xFFFFFFFF, STR_NONE },
{ WWT_BUTTON, 0, 470, 591, 22, 35, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP },
{ WWT_SCROLL, 1, 4, 291, 60, 386, SCROLL_VERTICAL, STR_NONE },
{ WWT_FLATBTN, 1, 391, 504, 45, 159, 0xFFFFFFFF, STR_NONE },
{ WWT_BUTTON, 0, 470, 591, 22, 35, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP },
{ WWT_BUTTON, 0, 350, 463, 22, 35, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP },
{ WWT_TEXT_BOX, 1, 4, 214, 45, 58, STR_NONE, STR_NONE },
{ WWT_BUTTON, 1, 218, 287, 45, 58, STR_OBJECT_SEARCH_CLEAR, STR_NONE },
{ WWT_IMGBTN, 1, 3, 287, 73, 76, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_OBJECT_FILTER_ALL_RIDES_TIP },
{ WWT_TAB, 1, 34, 64, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_TRANSPORT_RIDES_TIP },
{ WWT_TAB, 1, 65, 95, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_GENTLE_RIDES_TIP },
{ WWT_TAB, 1, 96, 126, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_ROLLER_COASTERS_TIP },
{ WWT_TAB, 1, 127, 157, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_THRILL_RIDES_TIP },
{ WWT_TAB, 1, 158, 188, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_WATER_RIDES_TIP },
{ WWT_TAB, 1, 189, 219, 47, 73, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOPS_STALLS_TIP },
{ WWT_TABLE_HEADER, 1, 4, 148, 80, 93, STR_NONE, STR_NONE },
{ WWT_TABLE_HEADER, 1, 149, 291, 80, 93, STR_NONE, STR_NONE },
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 ),
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STRING_DEFINED_TOOLTIP },
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB, STR_STRING_DEFINED_TOOLTIP ),
// Copied object type times...
{ WIDGETS_END }

2
src/openrct2-ui/windows/Error.cpp
View File

@ -23,7 +23,7 @@ enum {
};
static rct_widget window_error_widgets[] = {
{ WWT_IMGBTN, 0, 0, 199, 0, 41, 0xFFFFFFFF, STR_NONE },
MakeWidget({0, 0}, {200, 42}, WWT_IMGBTN, 0),
{ WIDGETS_END }
};

60
src/openrct2-ui/windows/Finances.cpp
View File

@ -87,12 +87,12 @@ enum
#pragma region Widgets
#define TAB_WIDGETS \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_SHOW_SUMMARY_TAB_TIP }, \
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_SHOW_CASH_TAB_TIP }, \
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_SHOW_PARK_VALUE_TAB_TIP }, \
{ WWT_TAB, 1, 96, 126, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_SHOW_WEEKLY_PROFIT_TAB_TIP }, \
{ WWT_TAB, 1, 127, 157, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_SHOW_MARKETING_TAB_TIP }, \
{ WWT_TAB, 1, 158, 188, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP }
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 )
static rct_widget _windowFinancesSummaryWidgets[] =
{
@ -107,7 +107,7 @@ static rct_widget _windowFinancesSummaryWidgets[] =
static rct_widget _windowFinancesCashWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1),
TAB_WIDGETS,
{ WIDGETS_END },
};
@ -115,7 +115,7 @@ static rct_widget _windowFinancesCashWidgets[] =
static rct_widget _windowFinancesParkValueWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1),
TAB_WIDGETS,
{ WIDGETS_END },
};
@ -123,7 +123,7 @@ static rct_widget _windowFinancesParkValueWidgets[] =
static rct_widget _windowFinancesProfitWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1),
TAB_WIDGETS,
{ WIDGETS_END },
};
@ -131,35 +131,35 @@ static rct_widget _windowFinancesProfitWidgets[] =
static rct_widget _windowFinancesMarketingWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW_OTHER_TABS, WH_OTHER_TABS),
{ WWT_RESIZE, 1, 0, 529, 43, WH_OTHER_TABS - 1, 0xFFFFFFFF, STR_NONE },
MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1),
TAB_WIDGETS,
{ WWT_GROUPBOX, 2, 3, 526, 47, 91, STR_MARKETING_CAMPAIGNS_IN_OPERATION, STR_NONE },
{ WWT_GROUPBOX, 2, 3, 526, 47, 252, STR_MARKETING_CAMPAIGNS_AVAILABLE, STR_NONE },
{ WWT_IMGBTN, 1, 8, 521, 0, 13, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN },
{ WWT_IMGBTN, 1, 8, 521, 0, 13, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN },
{ WWT_IMGBTN, 1, 8, 521, 0, 13, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN },
{ WWT_IMGBTN, 1, 8, 521, 0, 13, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN },
{ WWT_IMGBTN, 1, 8, 521, 0, 13, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN },
{ WWT_IMGBTN, 1, 8, 521, 0, 13, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN },
MakeWidget({3, 47}, { WW_OTHER_TABS - 6, 45}, WWT_GROUPBOX, 2, STR_MARKETING_CAMPAIGNS_IN_OPERATION ),
MakeWidget({3, 47}, { WW_OTHER_TABS - 6, 206}, WWT_GROUPBOX, 2, STR_MARKETING_CAMPAIGNS_AVAILABLE ),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN),
{ WIDGETS_END },
};
static rct_widget _windowFinancesResearchWidgets[] =
{
WINDOW_SHIM(WINDOW_TITLE, WW_RESEARCH, WH_RESEARCH),
{ WWT_RESIZE, 1, 0, 319, 43, 206, 0xFFFFFFFF, STR_NONE },
MakeWidget({0, 43}, {WW_RESEARCH, 164}, WWT_RESIZE, 1),
TAB_WIDGETS,
{ WWT_GROUPBOX, 2, 3, 316, 47, 91, STR_RESEARCH_FUNDING_, STR_NONE },
{ WWT_DROPDOWN, 2, 8, 167, 59, 72, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_BUTTON, 2, 156, 166, 60, 71, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_GROUPBOX, 2, 3, 316, 96, 202, STR_RESEARCH_PRIORITIES, STR_NONE },
{ WWT_CHECKBOX, 2, 8, 311, 108, 119, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 121, 132, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 134, 145, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 147, 158, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 160, 171, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 173, 184, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 186, 197, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP },
MakeWidget({ 3, 47}, { WW_RESEARCH - 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_RESEARCH - 6, 107}, WWT_GROUPBOX, 2, STR_RESEARCH_PRIORITIES ),
MakeWidget({ 8, 108}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ),
MakeWidget({ 8, 121}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ),
MakeWidget({ 8, 134}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ),
MakeWidget({ 8, 147}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ),
MakeWidget({ 8, 160}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ),
MakeWidget({ 8, 173}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ),
MakeWidget({ 8, 186}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ),
{ WIDGETS_END },
};

35
src/openrct2-ui/windows/Footpath.cpp
View File

@ -72,30 +72,31 @@ enum WINDOW_FOOTPATH_WIDGET_IDX
static rct_widget window_footpath_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
// Type group
{WWT_GROUPBOX, 0, 3, 102, 17, 71, STR_TYPE, STR_NONE},
{WWT_FLATBTN, 1, 6, 52, 30, 65, 0xFFFFFFFF, STR_FOOTPATH_TIP},
{WWT_FLATBTN, 1, 53, 99, 30, 65, 0xFFFFFFFF, STR_QUEUE_LINE_PATH_TIP},
MakeWidget({ 3, 17}, {100, 55}, WWT_GROUPBOX, 0, STR_TYPE ),
MakeWidget({ 6, 30}, { 47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_FOOTPATH_TIP ),
MakeWidget({53, 30}, { 47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_QUEUE_LINE_PATH_TIP ),
// Direction group
{WWT_GROUPBOX, 0, 3, 102, 75, 151, STR_DIRECTION, STR_NONE},
{WWT_FLATBTN, 1, 53, 97, 87, 115, SPR_CONSTRUCTION_DIRECTION_NE, STR_DIRECTION_TIP},
{WWT_FLATBTN, 1, 53, 97, 116, 144, SPR_CONSTRUCTION_DIRECTION_SE, STR_DIRECTION_TIP},
{WWT_FLATBTN, 1, 8, 52, 116, 144, SPR_CONSTRUCTION_DIRECTION_SW, STR_DIRECTION_TIP},
{WWT_FLATBTN, 1, 8, 52, 87, 115, SPR_CONSTRUCTION_DIRECTION_NW, STR_DIRECTION_TIP},
MakeWidget({ 3, 75}, {100, 77}, WWT_GROUPBOX, 0, STR_DIRECTION ),
MakeWidget({53, 87}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_NE, STR_DIRECTION_TIP ),
MakeWidget({53, 116}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_SE, STR_DIRECTION_TIP ),
MakeWidget({ 8, 116}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_SW, STR_DIRECTION_TIP ),
MakeWidget({ 8, 87}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_NW, STR_DIRECTION_TIP ),
// Slope group
{WWT_GROUPBOX, 0, 3, 102, 155, 195, STR_SLOPE, STR_NONE},
{WWT_FLATBTN, 1, 17, 40, 167, 190, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN, STR_SLOPE_DOWN_TIP},
{WWT_FLATBTN, 1, 41, 64, 167, 190, SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL, STR_LEVEL_TIP},
{WWT_FLATBTN, 1, 65, 88, 167, 190, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_SLOPE_UP_TIP},
{WWT_FLATBTN, 1, 8, 97, 202, 291, 0xFFFFFFFF, STR_CONSTRUCT_THE_SELECTED_FOOTPATH_SECTION_TIP},
{WWT_FLATBTN, 1, 30, 75, 295, 318, SPR_DEMOLISH_CURRENT_SECTION, STR_REMOVE_PREVIOUS_FOOTPATH_SECTION_TIP},
MakeWidget({ 3, 155}, {100, 41}, WWT_GROUPBOX, 0, STR_SLOPE ),
MakeWidget({17, 167}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN, STR_SLOPE_DOWN_TIP ),
MakeWidget({41, 167}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL, STR_LEVEL_TIP ),
MakeWidget({65, 167}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_SLOPE_UP_TIP ),
MakeWidget({ 8, 202}, { 90, 90}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_CONSTRUCT_THE_SELECTED_FOOTPATH_SECTION_TIP),
MakeWidget({30, 295}, { 46, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH_CURRENT_SECTION, STR_REMOVE_PREVIOUS_FOOTPATH_SECTION_TIP ),
// Mode group
{WWT_GROUPBOX, 0, 3, 102, 321, 374, 0xFFFFFFFF, STR_NONE},
{WWT_FLATBTN, 1, 13, 48, 332, 367, SPR_CONSTRUCTION_FOOTPATH_LAND, STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP},
{WWT_FLATBTN, 1, 57, 92, 332, 367, SPR_CONSTRUCTION_FOOTPATH_BRIDGE, STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP},
MakeWidget({ 3, 321}, {100, 54}, WWT_GROUPBOX, 0 ),
MakeWidget({13, 332}, { 36, 36}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_FOOTPATH_LAND, STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP ),
MakeWidget({57, 332}, { 36, 36}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_FOOTPATH_BRIDGE, STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP ),
{WIDGETS_END},
};

24
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -48,20 +48,20 @@ enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX
static rct_widget window_game_bottom_toolbar_widgets[] =
{
{ WWT_IMGBTN, 0, 0, 141, 0, 33, 0xFFFFFFFF, STR_NONE }, // Left outset panel
{ WWT_IMGBTN, 0, 2, 139, 2, 31, 0xFFFFFFFF, STR_NONE }, // Left inset panel
{ WWT_FLATBTN, 0, 2, 139, 1, 12, 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP }, // Money window
{ WWT_FLATBTN, 0, 2, 139, 11, 22, 0xFFFFFFFF, STR_NONE }, // Guests window
{ WWT_FLATBTN, 0, 2, 139, 21, 31, 0xFFFFFFFF, STR_PARK_RATING_TIP }, // Park rating window
MakeWidget({ 0, 0}, {142, 34}, WWT_IMGBTN, 0 ), // Left outset panel
MakeWidget({ 2, 2}, {138, 30}, WWT_IMGBTN, 0 ), // Left inset panel
MakeWidget({ 2, 1}, {138, 12}, WWT_FLATBTN, 0, 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP), // Money window
MakeWidget({ 2, 11}, {138, 12}, WWT_FLATBTN, 0 ), // Guests window
MakeWidget({ 2, 21}, {138, 11}, WWT_FLATBTN, 0, 0xFFFFFFFF, STR_PARK_RATING_TIP ), // Park rating window
{ WWT_IMGBTN, 2, 142, 497, 0, 33, 0xFFFFFFFF, STR_NONE }, // Middle outset panel
{ WWT_PLACEHOLDER, 2, 144, 495, 2, 31, 0xFFFFFFFF, STR_NONE }, // Middle inset panel
{ WWT_FLATBTN, 2, 147, 170, 5, 28, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP }, // Associated news item window
{ WWT_FLATBTN, 2, 469, 492, 5, 28, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP }, // Scroll to news item target
MakeWidget({142, 0}, {356, 34}, WWT_IMGBTN, 2 ), // Middle outset panel
MakeWidget({144, 2}, {352, 30}, WWT_PLACEHOLDER, 2 ), // Middle inset panel
MakeWidget({147, 5}, { 24, 24}, WWT_FLATBTN, 2, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP ), // Associated news item window
MakeWidget({469, 5}, { 24, 24}, WWT_FLATBTN, 2, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // Scroll to news item target
{ WWT_IMGBTN, 0, 498, 639, 0, 33, 0xFFFFFFFF, STR_NONE }, // Right outset panel
{ WWT_IMGBTN, 0, 500, 637, 2, 31, 0xFFFFFFFF, STR_NONE }, // Right inset panel
{ WWT_FLATBTN, 0, 500, 637, 2, 13, 0xFFFFFFFF, STR_NONE }, // Date
MakeWidget({498, 0}, {142, 34}, WWT_IMGBTN, 0 ), // Right outset panel
MakeWidget({500, 2}, {138, 30}, WWT_IMGBTN, 0 ), // Right inset panel
MakeWidget({500, 2}, {138, 12}, WWT_FLATBTN, 0 ), // Date
{ WIDGETS_END },
};

22
src/openrct2-ui/windows/GuestList.cpp
View File

@ -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),
{ WWT_RESIZE, 1, 0, 349, 43, 329, 0xFFFFFFFF, STR_NONE }, // tab content panel
{ WWT_DROPDOWN, 1, 5, 84, 59, 70, STR_ARG_4_PAGE_X, STR_NONE }, // page dropdown
{ WWT_BUTTON, 1, 73, 83, 60, 69, STR_DROPDOWN_GLYPH, STR_NONE }, // page dropdown button
{ WWT_DROPDOWN, 1, 120, 261, 59, 70, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP }, // information type dropdown
{ WWT_BUTTON, 1, 250, 260, 60, 69, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP }, // information type dropdown button
{ WWT_FLATBTN, 1, 273, 296, 46, 69, SPR_MAP, STR_SHOW_GUESTS_ON_MAP_TIP }, // map
{ WWT_FLATBTN, 1, 297, 320, 46, 69, SPR_G2_SEARCH, STR_GUESTS_FILTER_BY_NAME_TIP },// filter by name
{ WWT_FLATBTN, 1, 321, 344, 46, 69, SPR_TRACK_PEEP, STR_TRACKED_GUESTS_ONLY_TIP }, // tracking
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_INDIVIDUAL_GUESTS_TIP }, // tab 1
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SUMMARISED_GUESTS_TIP }, // tab 2
{ WWT_SCROLL, 1, 3, 346, 72, 326, SCROLL_BOTH, STR_NONE }, // 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
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
{ WIDGETS_END },
};

6
src/openrct2-ui/windows/NetworkStatus.cpp
View File

@ -25,9 +25,9 @@ enum WINDOW_NETWORK_STATUS_WIDGET_IDX {
};
static rct_widget window_network_status_widgets[] = {
{ WWT_FRAME, 0, 0, 440, 0, 90, 0xFFFFFFFF, STR_NONE }, // panel / background
{ WWT_CAPTION, 0, 1, 438, 1, 14, STR_NONE, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, 427, 437, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
MakeWidget({ 0, 0}, {441, 91}, WWT_FRAME, 0 ), // panel / background
MakeWidget({ 1, 1}, {438, 14}, WWT_CAPTION, 0, STR_NONE, STR_WINDOW_TITLE_TIP), // title bar
MakeWidget({427, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), // close x button
{ WIDGETS_END },
};

4
src/openrct2-ui/windows/News.cpp
View File

@ -34,8 +34,8 @@ enum WINDOW_NEWS_WIDGET_IDX {
static rct_widget window_news_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_FLATBTN, 0, 372, 395, 18, 41, SPR_TAB_GEARS_0, STR_NONE }, // settings
{ WWT_SCROLL, 0, 4, 395, 44, 295, SCROLL_VERTICAL, STR_NONE }, // scroll
MakeWidget({372, 18}, { 24, 24}, WWT_FLATBTN, 0, SPR_TAB_GEARS_0), // settings
MakeWidget({ 4, 44}, {392, 252}, WWT_SCROLL, 0, SCROLL_VERTICAL), // scroll
{ WIDGETS_END },
};

28
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -67,21 +67,19 @@ enum WINDOW_NEWS_WIDGET_IDX {
static rct_widget window_news_options_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 399, 43, 299, 0xFFFFFFFF, STR_NONE }, // tab content panel
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE }, // tab 1
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE }, // tab 2
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE }, // tab 2
{ WWT_CHECKBOX, 2, 7, 349, 49, 62, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
{ WWT_CHECKBOX, 2, 0, 0, 0, 0, STR_NONE, STR_NONE },
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 ),
{ WIDGETS_END },
};

22
src/openrct2-ui/windows/Player.cpp
View File

@ -48,20 +48,20 @@ enum WINDOW_PLAYER_WIDGET_IDX {
};
#define WINDOW_PLAYER_COMMON_WIDGETS \
{ WWT_FRAME, 0, 0, 191, 0, 156, 0xFFFFFFFF, STR_NONE }, /* Panel / Background */ \
{ WWT_CAPTION, 0, 1, 190, 1, 14, STR_STRING, STR_WINDOW_TITLE_TIP }, /* Title */ \
{ WWT_CLOSEBOX, 0, 179, 189, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, /* Close x button */ \
{ WWT_RESIZE, 1, 0, 191, 43, 156, 0xFFFFFFFF, STR_NONE }, /* Resize */ \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE }, /* Tab 1 */ \
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE } /* 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 */ \
MakeRemapWidget({ 3, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB ), /* Tab 1 */ \
MakeRemapWidget({ 34, 17}, { 31, 27}, WWT_TAB, 1, SPR_TAB ) /* Tab 2 */
static rct_widget window_player_overview_widgets[] = {
WINDOW_PLAYER_COMMON_WIDGETS,
{ WWT_DROPDOWN, 1, 3, 177, 46, 57, 0xFFFFFFFF, STR_NONE }, // Permission group
{ WWT_BUTTON, 1, 167, 177, 47, 56, STR_DROPDOWN_GLYPH, STR_NONE }, //
{ WWT_FLATBTN, 1, 179, 190, 45, 68, SPR_LOCATE, STR_LOCATE_PLAYER_TIP }, // Locate button
{ WWT_FLATBTN, 1, 179, 190, 69, 92, SPR_DEMOLISH, STR_KICK_PLAYER_TIP }, // Kick button
{ WWT_VIEWPORT, 1, 3, 177, 60, 120, 0xFFFFFFFF, STR_NONE }, // Viewport
MakeWidget({ 3, 46}, {175, 12}, WWT_DROPDOWN, 1 ), // Permission group
MakeWidget({167, 47}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ),
MakeWidget({179, 45}, { 12, 24}, WWT_FLATBTN, 1, SPR_LOCATE, STR_LOCATE_PLAYER_TIP), // Locate button
MakeWidget({179, 69}, { 12, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_KICK_PLAYER_TIP ), // Kick button
MakeWidget({ 3, 60}, {175, 61}, WWT_VIEWPORT, 1 ), // Viewport
{ WIDGETS_END },
};

40
src/openrct2-ui/windows/Research.cpp
View File

@ -63,31 +63,31 @@ enum {
static rct_widget window_research_development_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW_DEVELOPMENT, WH_DEVELOPMENT),
{ WWT_RESIZE, 1, 0, 299, 43, WH_DEVELOPMENT - 1, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP },
{ WWT_GROUPBOX, 2, 3, 292, 47, 116, STR_CURRENTLY_IN_DEVELOPMENT, STR_NONE },
{ WWT_GROUPBOX, 2, 3, 292, 124, 188, STR_LAST_DEVELOPMENT, STR_NONE },
{ WWT_FLATBTN, 2, 265, 288, 161, 184, 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP },
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 ),
{ WIDGETS_END },
};
static rct_widget window_research_funding_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW_FUNDING, WH_FUNDING),
{ WWT_RESIZE, 1, 0, 319, 43, WH_FUNDING - 1, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_RESEARCH_AND_DEVELOPMENT_TIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCES_RESEARCH_TIP },
{ WWT_GROUPBOX, 2, 3, 316, 47, 91, STR_RESEARCH_FUNDING_, STR_NONE },
{ WWT_DROPDOWN, 2, 8, 167, 59, 72, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_BUTTON, 2, 156, 166, 60, 71, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT },
{ WWT_GROUPBOX, 2, 3, 316, 96, 202, STR_RESEARCH_PRIORITIES, STR_NONE },
{ WWT_CHECKBOX, 2, 8, 311, 108, 119, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 121, 132, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 134, 145, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 147, 158, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 160, 171, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 173, 184, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP },
{ WWT_CHECKBOX, 2, 8, 311, 186, 197, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP },
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 ),
{ WIDGETS_END },
};

22
src/openrct2-ui/windows/StaffList.cpp
View File

@ -112,17 +112,17 @@ constexpr int32_t MAX_WH = 450;
static rct_widget window_staff_list_widgets[] = {
WINDOW_SHIM(WINDOW_TITLE, WW, WH),
{ WWT_RESIZE, 1, 0, 319, 43, 269, 0xFFFFFFFF, STR_NONE }, // tab content panel
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_HANDYMEN_TAB_TIP }, // handymen tab
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_MECHANICS_TAB_TIP }, // mechanics tab
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_SECURITY_TAB_TIP }, // security guards tab
{ WWT_TAB, 1, 96, 126, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_ENTERTAINERS_TAB_TIP }, // entertainers tab
{ WWT_SCROLL, 1, 3, 316, 72, 266, SCROLL_VERTICAL, STR_NONE }, // staff list
{ WWT_COLOURBTN, 1, 130, 141, 58, 69, STR_NONE, STR_UNIFORM_COLOUR_TIP }, // uniform colour picker
{ WWT_BUTTON, 0, WW - 155, WW - 11, 17, 29, STR_NONE, STR_HIRE_STAFF_TIP }, // hire button
{ WWT_FLATBTN, 1, WW - 77, WW - 54, 46, 69, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF }, // quick fire staff
{ WWT_FLATBTN, 1, WW - 53, WW - 30, 46, 69, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP }, // show staff patrol area tool
{ WWT_FLATBTN, 1, WW - 29, WW - 6, 46, 69, 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
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
{ WIDGETS_END },
};

2
src/openrct2-ui/windows/TitleOptions.cpp
View File

@ -20,7 +20,7 @@ enum WINDOW_TITLE_OPTIONS_WIDGET_IDX {
};
static rct_widget window_title_options_widgets[] = {
{ WWT_BUTTON, 2, 0, 79, 0, 14, STR_OPTIONS, STR_OPTIONS_TIP },
MakeWidget({0, 0}, {80, 15}, WWT_BUTTON, 2, STR_OPTIONS, STR_OPTIONS_TIP),
{ WIDGETS_END },
};

2
src/openrct2/interface/Widget.h
View File

@ -86,7 +86,7 @@ constexpr rct_widget MakeRemapWidget(
}
#define MakeSpinnerWidgets(...) \
MakeWidget(__VA_ARGS__), MakeSpinnerDecreaseWidget(__VA_ARGS__), MakeSpinnerIncreaseWidget(__VA_ARGS__)
MakeWidget(__VA_ARGS__), MakeSpinnerIncreaseWidget(__VA_ARGS__), MakeSpinnerDecreaseWidget(__VA_ARGS__)
constexpr rct_widget MakeSpinnerDecreaseWidget(
const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] uint8_t type, uint8_t colour,