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

Make WINDOW_SKELETON take a title, height and width

This commit is contained in:
Gymnasiast 2020-05-05 22:11:10 +02:00
parent 559ede5d14
commit 96fe3d3b3c
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
50 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,19 +46,19 @@ enum WINDOW_ABOUT_WIDGET_IDX {
};
#define WIDGETS_MAIN \
WINDOW_SKELETON, \
WINDOW_SKELETON(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 */
{ WWT_TAB, 1, 94, 184, 17, TABHEIGHT, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE /* about RCT2 button */
static rct_widget window_about_openrct2_widgets[] = {
WIDGETS_MAIN,
{ WIDGETS_MAIN },
{ WWT_BUTTON, 1, 100, 299, WH - 50, WH - 39, STR_CHANGELOG_ELLIPSIS, STR_NONE }, // changelog button
{ WIDGETS_END }
};
static rct_widget window_about_rct2_widgets[] = {
WIDGETS_MAIN,
{ WIDGETS_MAIN },
{ WWT_BUTTON, 1, 100, 299, WH - 50, WH - 39, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS, STR_NONE }, // music credits button
{ WIDGETS_END },
};

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

@ -58,7 +58,7 @@ static constexpr const rct_string_id BannerColouredTextFormats[] = {
};
static rct_widget window_banner_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_VIEWPORT, 1, 3, WW - 26,17, WH - 20, 0x0FFFFFFFE, STR_NONE}, // tab content panel
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 19, 42, SPR_RENAME, STR_CHANGE_BANNER_TEXT_TIP}, // change banner button
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 43, 66, SPR_NO_ENTRY, STR_SET_AS_NO_ENTRY_BANNER_TIP}, // no entry button

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

@ -39,7 +39,7 @@ constexpr int32_t MIN_WW = 300;
constexpr int32_t MIN_WH = 200;
static rct_widget window_changelog_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, WW - 1, 14, WH - 1, 0xFFFFFFFF, STR_NONE }, // content panel
{ WWT_SCROLL, 1, 3, WW - 3, 16, WH - 15, SCROLL_BOTH, STR_NONE }, // scroll area
{ WIDGETS_END },

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

@ -206,7 +206,7 @@ constexpr int32_t TXTO = 3; // Text horizontal offset from button left (for but
#pragma endregion
#define MAIN_CHEATS_WIDGETS \
WINDOW_SKELETON, \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_IMGBTN, 1, 0, WW - 1, 43, WH - 1, 0xFFFFFFFF, STR_NONE }, /* tab content panel */ \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_FINANCIAL_CHEATS_TIP }, /* tab 1 */ \
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_GUEST_CHEATS_TIP }, /* tab 2 */ \

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

@ -34,7 +34,7 @@ enum WINDOW_CLEAR_SCENERY_WIDGET_IDX {
#define WH 93
static rct_widget window_clear_scenery_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_IMGBTN, 0, 27, 70, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE }, // preview box
{ WWT_TRNBTN, 1, 28, 43, 18, 33, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP }, // decrement size
{ WWT_TRNBTN, 1, 54, 69, 32, 47, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP }, // increment size

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

@ -34,7 +34,7 @@ enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX {
};
static rct_widget window_custom_currency_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
SPINNER_WIDGETS (1, 100, 200, 30, 40, STR_CHEAT_CURRENCY_FORMAT, STR_NONE), // NB: 3 widgets
{ WWT_BUTTON, 1, 120, 200, 50, 60, 0, STR_NONE },
{ WWT_DROPDOWN, 1, 220, 350, 50, 60, STR_NONE, STR_NONE },

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

@ -34,7 +34,7 @@ enum WINDOW_RIDE_DEMOLISH_WIDGET_IDX {
// 0x009AEBA0
static rct_widget window_ride_demolish_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_BUTTON, 0, 10, 94, WH - 20, WH - 9, STR_DEMOLISH, STR_NONE },
{ WWT_BUTTON, 0, WW - 95, WW - 11, WH - 20, WH - 9, STR_SAVE_PROMPT_CANCEL, STR_NONE },
{ WIDGETS_END }

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

@ -46,7 +46,7 @@ enum {
};
static rct_widget window_editor_inventions_list_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(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 },

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

@ -141,7 +141,7 @@ 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_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 599, 43, 399, 0xFFFFFFFF, STR_NONE },
{ WWT_BUTTON, 0, 470, 591, 23, 34, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP },
{ WWT_SCROLL, 1, 4, 291, 60, 386, SCROLL_VERTICAL, STR_NONE },

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

@ -86,7 +86,7 @@ enum {
};
#define MAIN_OBJECTIVE_OPTIONS_WIDGETS \
WINDOW_SKELETON, \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_RESIZE, 1, 0, 279, 43, 148, STR_NONE, STR_NONE }, \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SELECT_OBJECTIVE_AND_PARK_NAME_TIP }, \
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SELECT_RIDES_TO_BE_PRESERVED_TIP }

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

@ -113,7 +113,7 @@ enum {
};
static rct_widget window_editor_scenario_options_financial_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 279, 43, 148, STR_NONE, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_FINANCIAL_TIP },
{ WWT_TAB, 1, 34, 64, 17, 46, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP },

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

@ -93,7 +93,7 @@ enum
static rct_widget _windowFinancesSummaryWidgets[] =
{
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 529, 43, 309, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WWT_SCROLL, 1, 130, 520, 50, 260, SCROLL_HORIZONTAL, STR_NONE },
@ -103,7 +103,7 @@ static rct_widget _windowFinancesSummaryWidgets[] =
static rct_widget _windowFinancesCashWidgets[] =
{
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WIDGETS_END },
@ -111,7 +111,7 @@ static rct_widget _windowFinancesCashWidgets[] =
static rct_widget _windowFinancesParkValueWidgets[] =
{
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WIDGETS_END },
@ -119,7 +119,7 @@ static rct_widget _windowFinancesParkValueWidgets[] =
static rct_widget _windowFinancesProfitWidgets[] =
{
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WIDGETS_END },
@ -127,7 +127,7 @@ static rct_widget _windowFinancesProfitWidgets[] =
static rct_widget _windowFinancesMarketingWidgets[] =
{
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 529, 43, 256, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WWT_GROUPBOX, 2, 3, 526, 47, 91, STR_MARKETING_CAMPAIGNS_IN_OPERATION, STR_NONE },
@ -143,7 +143,7 @@ static rct_widget _windowFinancesMarketingWidgets[] =
static rct_widget _windowFinancesResearchWidgets[] =
{
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 319, 43, 206, 0xFFFFFFFF, STR_NONE },
TAB_WIDGETS,
{ WWT_GROUPBOX, 2, 3, 316, 47, 91, STR_RESEARCH_FUNDING_, STR_NONE },

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

@ -71,7 +71,7 @@ enum WINDOW_FOOTPATH_WIDGET_IDX
};
static rct_widget window_footpath_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(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},

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

@ -75,7 +75,7 @@ validate_global_widx(WC_PEEP, WIDX_PICKUP);
static constexpr int32_t TabWidth = 30;
#define MAIN_GUEST_WIDGETS \
WINDOW_SKELETON, \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_RESIZE, 1, 0, 191, 43, 156, 0xFFFFFFFF, STR_NONE }, /* Resize */ \
{ WWT_TAB, 1, 3, TabWidth + 3, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_VIEW_TIP }, /* Tab 1 */ \
{ WWT_TAB, 1, 34, TabWidth + 34, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_GUEST_NEEDS_TIP }, /* Tab 2 */ \

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

@ -68,7 +68,7 @@ static constexpr const rct_string_id viewNames[VIEW_COUNT] = {
};
static rct_widget window_guest_list_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(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

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

@ -42,7 +42,7 @@ constexpr int32_t PREVIEW_BUTTONS_LEFT = WW - 25;
constexpr int32_t ACTION_BUTTONS_LEFT = WW - 100;
static rct_widget window_install_track_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_FLATBTN, 0, 4, WW - 5, 18, 236, STR_NONE, STR_NONE },
{ WWT_FLATBTN, 0, PREVIEW_BUTTONS_LEFT, WW_LESS_PADDING, 422, 445, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP },
{ WWT_FLATBTN, 0, PREVIEW_BUTTONS_LEFT, WW_LESS_PADDING, 398, 421, SPR_SCENERY, STR_TOGGLE_SCENERY_TIP },

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

@ -42,7 +42,7 @@ enum WINDOW_LAND_WIDGET_IDX {
};
static rct_widget window_land_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_FLATBTN, 1, 19, 42, 19, 42, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_ENABLE_MOUNTAIN_TOOL_TIP }, // mountain mode
{ WWT_FLATBTN, 1, 55, 78, 19, 42, SPR_PAINTBRUSH, STR_DISABLE_ELEVATION }, // paint mode

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

@ -37,7 +37,7 @@ enum WINDOW_WATER_WIDGET_IDX {
};
static rct_widget window_land_rights_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_IMGBTN, 0, 27, 70, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE }, // preview box
{ WWT_TRNBTN, 2, 28, 43, 18, 33, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_RIGHTS_TIP }, // decrement size
{ WWT_TRNBTN, 2, 54, 69, 32, 47, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP }, // increment size

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

@ -62,7 +62,7 @@ enum
// 0x9DE48C
static rct_widget window_loadsave_widgets[] =
{
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, WW - 1, WH - 1, WH - 1, 0xFFFFFFFF, STR_NONE }, // tab content panel
{ WWT_BUTTON, 0, 4, 87, 36, 49, STR_LOADSAVE_DEFAULT, STR_LOADSAVE_DEFAULT_TIP }, // Go to default directory
{ WWT_BUTTON, 0, 88, 171, 36, 49, STR_FILEBROWSER_ACTION_UP, STR_NONE}, // Up

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

@ -80,7 +80,7 @@ enum WINDOW_MAP_WIDGET_IDX {
validate_global_widx(WC_MAP, WIDX_ROTATE_90);
static rct_widget window_map_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 244, 43, 257, STR_NONE, STR_NONE },
{ WWT_COLOURBTN, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_PEOPLE_ON_MAP_TIP },
{ WWT_COLOURBTN, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_RIDES_STALLS_ON_MAP_TIP },

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

@ -115,7 +115,7 @@ constexpr int32_t WW = 250;
constexpr int32_t WH = 273;
#define SHARED_WIDGETS \
WINDOW_SKELETON, /* WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE */ \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, /* WIDX_BACKGROUND, WIDX_TITLE, WIDX_CLOSE */ \
{ WWT_RESIZE, 1, 0, WW - 1, 43, WH - 2, 0xFFFFFFFF, STR_NONE }, /* WIDX_PAGE_BACKGROUND */ \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE }, /* WIDX_TAB_1 */ \
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_NONE }, /* WIDX_TAB_2 */ \

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

@ -47,7 +47,7 @@ enum {
};
static rct_widget window_maze_construction_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_GROUPBOX, 0, 3, 162, 17, 71, STR_RIDE_CONSTRUCTION_MODE, STR_NONE },
{ WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, STR_NONE },
{ WWT_EMPTY, 0, 0, 0, 0, 0, 0xFFFFFFFF, STR_NONE },

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

@ -26,7 +26,7 @@ enum WINDOW_MUSIC_CREDITS_WIDGET_IDX {
};
static rct_widget window_music_credits_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_SCROLL, 0, 4, 505, 18, 309, SCROLL_VERTICAL, STR_NONE }, // scroll
{ WIDGETS_END },
};

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

@ -41,7 +41,7 @@ enum WINDOW_NEW_CAMPAIGN_WIDGET_IDX {
};
static rct_widget window_new_campaign_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_LABEL, 0, 14, 139, 24, 35, 0, STR_NONE }, // ride label
{ WWT_DROPDOWN, 0, 100, 341, 24, 35, 0, STR_NONE }, // ride dropdown
{ WWT_BUTTON, 0, 330, 340, 25, 34, STR_DROPDOWN_GLYPH, STR_NONE }, // ride dropdown button

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

@ -182,7 +182,7 @@ enum {
};
static rct_widget window_new_ride_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 600, 43, WH - 1, 0xFFFFFFFF, STR_NONE },
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_TRANSPORT_RIDES_TIP },
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_GENTLE_RIDES_TIP },

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

@ -33,7 +33,7 @@ enum WINDOW_NEWS_WIDGET_IDX {
};
static rct_widget window_news_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(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
{ WIDGETS_END },

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

@ -67,7 +67,7 @@ enum WINDOW_NEWS_WIDGET_IDX {
};
static rct_widget window_news_options_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(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

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

@ -213,7 +213,7 @@ constexpr int32_t WH = 332;
#endif
#define MAIN_OPTIONS_WIDGETS \
WINDOW_SKELETON, \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_RESIZE, 1, 0, WW-1, 43, WH-1, 0xFFFFFFFF, STR_NONE }, \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_OPTIONS_DISPLAY_TIP }, \
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_OPTIONS_RENDERING_TIP }, \

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

@ -79,7 +79,7 @@ enum WINDOW_PARK_WIDGET_IDX {
#pragma region Widgets
#define MAIN_PARK_WIDGETS(WW) \
WINDOW_SKELETON, \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_RESIZE, 1, 0, WW - 1, 43, 173, 0xFFFFFFFF, STR_NONE }, /* tab content panel */ \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_ENTRANCE_TAB_TIP }, /* tab 1 */ \
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_PARK_RATING_TAB_TIP }, /* tab 2 */ \

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

@ -59,7 +59,7 @@ enum {
#pragma region Widgets
static rct_widget window_research_development_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 299, 43, 195, 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 },
@ -70,7 +70,7 @@ static rct_widget window_research_development_widgets[] = {
};
static rct_widget window_research_funding_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 319, 43, 206, 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 },

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

@ -210,7 +210,7 @@ enum {
constexpr int32_t RCT1_LIGHT_OFFSET = 4;
#define MAIN_RIDE_WIDGETS \
WINDOW_SKELETON, \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_RESIZE, 1, 0, 315, 43, 179, 0xFFFFFFFF, STR_NONE }, \
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_VIEW_OF_RIDE_ATTRACTION_TIP }, \
{ WWT_TAB, 1, 34, 64, 17, 46, IMAGE_TYPE_REMAP | SPR_TAB, STR_VEHICLE_DETAILS_AND_OPTIONS_TIP }, \

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

@ -92,7 +92,7 @@ validate_global_widx(WC_RIDE_CONSTRUCTION, WIDX_EXIT);
validate_global_widx(WC_RIDE_CONSTRUCTION, WIDX_ROTATE);
static rct_widget window_ride_construction_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_GROUPBOX, 0, 3, 162, 17, 73, STR_RIDE_CONSTRUCTION_DIRECTION, STR_NONE },
{ WWT_GROUPBOX, 0, 3, 162, 76, 116, STR_RIDE_CONSTRUCTION_SLOPE, STR_NONE },
{ WWT_GROUPBOX, 0, 3, 162, 120, 160, STR_RIDE_CONSTRUCTION_ROLL_BANKING, STR_NONE },

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

@ -56,7 +56,7 @@ enum WINDOW_RIDE_LIST_WIDGET_IDX {
};
static rct_widget window_ride_list_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 339, 43, 239, 0xFFFFFFFF, STR_NONE }, // tab page background
{ WWT_FLATBTN, 1, 315, 338, 60, 83, SPR_TOGGLE_OPEN_CLOSE, STR_OPEN_OR_CLOSE_ALL_RIDES }, // open / close all toggle
{ WWT_DROPDOWN, 1, 150, 273, 46, 57, 0xFFFFFFFF, STR_NONE }, // current information type

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

@ -36,7 +36,7 @@ enum WINDOW_SAVE_PROMPT_WIDGET_IDX {
};
static rct_widget window_save_prompt_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_LABEL_CENTRED, 0, 2, 257, 19, 30, 0, STR_NONE }, // question/label
{ WWT_BUTTON, 0, 8, 85, 35, 48, STR_SAVE_PROMPT_SAVE, STR_NONE }, // save
{ WWT_BUTTON, 0, 91, 168, 35, 48, STR_SAVE_PROMPT_DONT_SAVE, STR_NONE }, // don't save
@ -55,7 +55,7 @@ enum WINDOW_QUIT_PROMPT_WIDGET_IDX {
static rct_widget window_quit_prompt_widgets[] = {
{ WWT_FRAME, 0, 0, 176, 0, 37, STR_NONE, STR_NONE }, // panel / background
{ WWT_CAPTION, 0, 1, 175, 1, 14, STR_QUIT_GAME_PROMPT_TITLE, STR_WINDOW_TITLE_TIP }, // title bar
WINDOW_SKELETON, // close x button
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, // close x button
{ WWT_BUTTON, 0, 8, 85, 19, 32, STR_OK, STR_NONE }, // ok
{ WWT_BUTTON, 0, 91, 168, 19, 32, STR_CANCEL, STR_NONE }, // cancel
{ WIDGETS_END },

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

@ -156,7 +156,7 @@ validate_global_widx(WC_SCENERY, WIDX_SCENERY_ROTATE_OBJECTS_BUTTON);
validate_global_widx(WC_SCENERY, WIDX_SCENERY_EYEDROPPER_BUTTON);
static rct_widget window_scenery_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 633, 43, 141, 0xFFFFFFFF, STR_NONE }, // 8 0x009DE2C8
{ WWT_TAB, 1, 3, 33, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 10 0x009DE2D8
{ WWT_TAB, 1, 34, 64, 17, 43, 0xFFFFFFFF, STR_STRING_DEFINED_TOOLTIP }, // 20 0x009DE2E8

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

@ -28,7 +28,7 @@ enum WINDOW_SHORTCUT_CHANGE_WIDGET_IDX {
// 0x9DE4E0
static rct_widget window_shortcut_change_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WIDGETS_END }
};

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

@ -33,7 +33,7 @@ enum WINDOW_SHORTCUT_WIDGET_IDX {
// 0x9DE48C
static rct_widget window_shortcut_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_SCROLL, 0, 4, WW - 5, 18, WH - 18, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP },
{ WWT_BUTTON, 0, 4, 153, WH-15, WH - 4, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP },
{ WIDGETS_END }

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

@ -43,7 +43,7 @@ enum WINDOW_SIGN_WIDGET_IDX {
// 0x9AEE00
static rct_widget window_sign_widgets[] = {
WINDOW_SKELETON, // close x button
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, // close x button
{ WWT_VIEWPORT, 1, 3, WW - 26, 17, WH - 20, STR_VIEWPORT, STR_NONE }, // Viewport
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 19, 42, SPR_RENAME, STR_CHANGE_SIGN_TEXT_TIP }, // change sign button
{ WWT_FLATBTN, 1, WW - 25, WW - 2, 67, 90, SPR_DEMOLISH, STR_DEMOLISH_SIGN_TIP }, // demolish button

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

@ -71,7 +71,7 @@ validate_global_widx(WC_PEEP, WIDX_PATROL);
validate_global_widx(WC_STAFF, WIDX_PICKUP);
static rct_widget window_staff_overview_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, WW - 1, 43, WH - 1, 0xFFFFFFFF, STR_NONE }, // Resize
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OVERVIEW_TIP },// Tab 1
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OPTIONS_TIP}, // Tab 2
@ -91,7 +91,7 @@ static rct_widget window_staff_overview_widgets[] = {
static rct_widget window_staff_options_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE }, // Panel / Background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP }, // Title
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, WW - 1, 43, WH - 1, 0xFFFFFFFF, STR_NONE }, // Resize
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OVERVIEW_TIP },// Tab 1
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OPTIONS_TIP}, // Tab 2
@ -110,7 +110,7 @@ static rct_widget window_staff_options_widgets[] = {
static rct_widget window_staff_stats_widgets[] = {
{ WWT_FRAME, 0, 0, WW - 1, 0, WH - 1, 0xFFFFFFFF, STR_NONE }, // Panel / Background
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_STRINGID, STR_WINDOW_TITLE_TIP }, // Title
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, WW - 1, 43, WH - 1, 0xFFFFFFFF, STR_NONE }, // Resize
{ WWT_TAB, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OVERVIEW_TIP },// Tab 1
{ WWT_TAB, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_STAFF_OPTIONS_TIP}, // Tab 2

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

@ -31,7 +31,7 @@ enum WINDOW_STAFF_FIRE_WIDGET_IDX {
// 0x9AFB4C
static rct_widget window_staff_fire_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_BUTTON, 0, 10, 94, WH - 20, WH - 9, STR_YES, STR_NONE },
{ WWT_BUTTON, 0, WW - 95, WW - 11, WH - 20, WH - 9, STR_SAVE_PROMPT_CANCEL, STR_NONE },
{ WIDGETS_END }

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

@ -111,7 +111,7 @@ constexpr int32_t MAX_WW = 500;
constexpr int32_t MAX_WH = 450;
static rct_widget window_staff_list_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(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

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

@ -40,7 +40,7 @@ enum WINDOW_TEXT_INPUT_WIDGET_IDX {
// 0x9DE4E0
static rct_widget window_text_input_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_BUTTON, 1, WW - 80, WW - 10, WH - 22, WH - 9, STR_CANCEL, STR_NONE },
{ WWT_BUTTON, 1, 10, 80, WH - 22, WH - 9, STR_OK, STR_NONE },
{ WIDGETS_END }

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

@ -251,7 +251,7 @@ constexpr int32_t BUTTONH = 17;
#define CHK(x, y) x, x + 13, y + 2, y + 15
#define MAIN_TILE_INSPECTOR_WIDGETS \
WINDOW_SKELETON, \
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) }, \
{ WWT_SCROLL, 1, 3, WW - 4, 57, WH - PADDING_BOTTOM, 2, STR_NONE }, /* Element list */ \
SPINNER_WIDGETS (1, 20, 70, 23, 34, STR_NONE, STR_NONE), /* Spinner X (3 widgets) */ \
SPINNER_WIDGETS (1, 90, 140, 23, 34, STR_NONE, STR_NONE), /* Spinner Y (3 widgets) */ \

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

@ -72,7 +72,7 @@ enum {
};
static rct_widget window_scenarioselect_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_IMGBTN, 1, 0, 733, 50, 333, 0xFFFFFFFF, STR_NONE }, // tab content panel
{ WWT_TAB, 1, 3, 93, 17, 50, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE }, // tab 1
{ WWT_TAB, 1, 94, 184, 17, 50, IMAGE_TYPE_REMAP | SPR_TAB_LARGE, STR_NONE }, // tab 2

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

@ -35,7 +35,7 @@ enum {
};
static rct_widget window_track_manage_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_BUTTON, 0, 10, 119, 24, 35, STR_TRACK_MANAGE_RENAME, STR_NONE },
{ WWT_BUTTON, 0, 130, 239, 24, 35, STR_TRACK_MANAGE_DELETE, STR_NONE },
{ WIDGETS_END }
@ -44,7 +44,7 @@ static rct_widget window_track_manage_widgets[] = {
static rct_widget window_track_delete_prompt_widgets[] = {
{ WWT_FRAME, 0, 0, 249, 0, 73, STR_NONE, STR_NONE },
{ WWT_CAPTION, 0, 1, 248, 1, 14, STR_DELETE_FILE, STR_WINDOW_TITLE_TIP },
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_BUTTON, 0, 10, 119, 54, 65, STR_TRACK_MANAGE_DELETE, STR_NONE },
{ WWT_BUTTON, 0, 130, 239, 54, 65, STR_CANCEL, STR_NONE },
{ WIDGETS_END }

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

@ -60,7 +60,7 @@ enum {
validate_global_widx(WC_TRACK_DESIGN_PLACE, WIDX_ROTATE);
static rct_widget window_track_place_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_FLATBTN, 0, 173, 196, 83, 106, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP },
{ WWT_FLATBTN, 0, 173, 196, 59, 82, SPR_MIRROR_ARROW, STR_MIRROR_IMAGE_TIP },
{ WWT_BUTTON, 0, 4, 195, 109, 120, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP },

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

@ -45,7 +45,7 @@ enum {
validate_global_widx(WC_TRACK_DESIGN_LIST, WIDX_ROTATE);
static rct_widget window_track_list_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_TABLE_HEADER, 0, 4, 221, 18, 30, STR_SELECT_OTHER_RIDE, STR_NONE },
{ WWT_TEXT_BOX, 1, 4, 127, 32, 44, STR_NONE, STR_NONE },
{ WWT_BUTTON, 0, 130, 221, 32, 44, STR_OBJECT_SEARCH_CLEAR, STR_NONE },

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

@ -34,7 +34,7 @@ enum {
};
static rct_widget window_viewport_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_RESIZE, 1, 0, 0, 14, 0, 0xFFFFFFFF, STR_NONE }, // resize
{ WWT_VIEWPORT, 0, 3, 0, 17, 0, 0xFFFFFFFF, STR_NONE }, // viewport

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

@ -31,7 +31,7 @@ enum WINDOW_WATER_WIDGET_IDX {
};
static rct_widget window_water_widgets[] = {
WINDOW_SKELETON,
{ WINDOW_SKELETON(WINDOW_TITLE, WW, WH) },
{ WWT_IMGBTN, 0, 16, 59, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE }, // preview box
{ WWT_TRNBTN, 2, 17, 32, 18, 33, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_WATER_TIP }, // decrement size
{ WWT_TRNBTN, 2, 43, 58, 32, 47, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_WATER_TIP }, // increment size

18
src/openrct2-ui/windows/Window.h
View File

@ -195,16 +195,18 @@ void window_tooltip_close();
rct_window* window_scenery_scatter_open();
// clang-format off
#ifndef LEFT_CLOSEBOX
// close button on right of window
#define WINDOW_SKELETON \
{ WWT_FRAME, 0, 0, WW - 1, 0, WH, 0xFFFFFFFF, STR_NONE }, \
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, WINDOW_TITLE, STR_WINDOW_TITLE_TIP }, \
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }
#define WINDOW_SKELETON(TITLE, WIDTH, HEIGHT) \
WWT_FRAME, 0, 0, WIDTH - 1, 0, HEIGHT, 0xFFFFFFFF, STR_NONE }, \
{ WWT_CAPTION, 0, 1, WIDTH - 2, 1, 14, TITLE, STR_WINDOW_TITLE_TIP }, \
{ WWT_CLOSEBOX, 0, WIDTH - 13, WIDTH - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP
#else
// close button on left of window
#define WINDOW_SKELETON \
{ WWT_FRAME, 0, 0, WW - 1, 0, WH, 0xFFFFFFFF, STR_NONE }, \
{ WWT_CAPTION, 0, 13, WW - 2, 1, 14, WINDOW_TITLE, STR_WINDOW_TITLE_TIP }, \
{ WWT_CLOSEBOX, 0, 2, 12, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }
#define WINDOW_SKELETON(TITLE, WIDTH, HEIGHT) \
WWT_FRAME, 0, 0, WIDTH - 1, 0, HEIGHT, 0xFFFFFFFF, STR_NONE }, \
{ WWT_CAPTION, 0, 13, WIDTH - 2, 1, 14, TITLE, STR_WINDOW_TITLE_TIP }, \
{ WWT_CLOSEBOX, 0, 2, 12, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP
#endif
// clang-format on