diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp index 59d1c334b4..39f1480d49 100644 --- a/src/openrct2-ui/windows/About.cpp +++ b/src/openrct2-ui/windows/About.cpp @@ -50,21 +50,21 @@ enum WINDOW_ABOUT_WIDGET_IDX { #define WIDGETS_MAIN \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - 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 */ + MakeWidget ({ 0, TABHEIGHT}, {WW, WH - TABHEIGHT}, WWT_IMGBTN, WindowColour::Secondary ), /* page background */ \ + MakeRemapWidget({ 3, 17}, {91, TABHEIGHT - 16}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), /* about OpenRCT2 button */ \ + MakeRemapWidget({94, 17}, {91, TABHEIGHT - 16}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE) /* about RCT2 button */ static rct_widget window_about_openrct2_widgets[] = { WIDGETS_MAIN, - MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 2}, {200, 14}, WWT_BUTTON, 1, STR_CHANGELOG_ELLIPSIS), // changelog button - MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 1}, {200, 14}, WWT_BUTTON, 1, STR_JOIN_DISCORD ), // "join discord" button - MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 0}, {200, 14}, WWT_PLACEHOLDER, 1, STR_UPDATE_AVAILABLE ), // "new version" button + MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 2}, {200, 14}, WWT_BUTTON, WindowColour::Secondary, STR_CHANGELOG_ELLIPSIS), // changelog button + MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 1}, {200, 14}, WWT_BUTTON, WindowColour::Secondary, STR_JOIN_DISCORD ), // "join discord" button + MakeWidget({100, WH - TABHEIGHT - (14 + 3) * 0}, {200, 14}, WWT_PLACEHOLDER, WindowColour::Secondary, STR_UPDATE_AVAILABLE ), // "new version" button { WIDGETS_END } }; static rct_widget window_about_rct2_widgets[] = { WIDGETS_MAIN, - MakeWidget({100, WH - TABHEIGHT}, {200, 14}, WWT_BUTTON, 1, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS), // music credits button + MakeWidget({100, WH - TABHEIGHT}, {200, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MUSIC_ACKNOWLEDGEMENTS_ELLIPSIS), // music credits button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 0f32ad7198..5511313dd3 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -59,13 +59,13 @@ static constexpr const rct_string_id BannerColouredTextFormats[] = { static rct_widget window_banner_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 3, 17}, {85, 60}, WWT_VIEWPORT, 1, 0x0FFFFFFFE ), // tab content panel - MakeWidget({WW - 25, 19}, {24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_CHANGE_BANNER_TEXT_TIP ), // change banner button - MakeWidget({WW - 25, 43}, {24, 24}, WWT_FLATBTN, 1, SPR_NO_ENTRY, STR_SET_AS_NO_ENTRY_BANNER_TIP ), // no entry button - MakeWidget({WW - 25, 67}, {24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_DEMOLISH_BANNER_TIP ), // demolish button - MakeWidget({ 5, WH - 16}, {12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // high money - MakeWidget({ 43, WH - 16}, {39, 12}, WWT_DROPDOWN, 1 ), // high money - MakeWidget({ 70, WH - 15}, {11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_TEXT_COLOUR_TIP ), // high money + MakeWidget({ 3, 17}, {85, 60}, WWT_VIEWPORT, WindowColour::Secondary, 0x0FFFFFFFE ), // tab content panel + MakeWidget({WW - 25, 19}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RENAME, STR_CHANGE_BANNER_TEXT_TIP ), // change banner button + MakeWidget({WW - 25, 43}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_NO_ENTRY, STR_SET_AS_NO_ENTRY_BANNER_TIP ), // no entry button + MakeWidget({WW - 25, 67}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH, STR_DEMOLISH_BANNER_TIP ), // demolish button + MakeWidget({ 5, WH - 16}, {12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // high money + MakeWidget({ 43, WH - 16}, {39, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // high money + MakeWidget({ 70, WH - 15}, {11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_TEXT_COLOUR_TIP ), // high money { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index ffbc2c260d..8b37c59454 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -43,9 +43,9 @@ constexpr int32_t MIN_WH = 250; static rct_widget window_changelog_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({0, 14}, {500, 382}, WWT_RESIZE, 1 ), // content panel - MakeWidget({3, 16}, {495, 366}, WWT_SCROLL, 1, SCROLL_BOTH ), // scroll area - MakeWidget({3, 473}, {300, 14}, WWT_PLACEHOLDER, 1, STR_NEW_RELEASE_DOWNLOAD_PAGE), // changelog button + MakeWidget({0, 14}, {500, 382}, WWT_RESIZE, WindowColour::Secondary ), // content panel + MakeWidget({3, 16}, {495, 366}, WWT_SCROLL, WindowColour::Secondary, SCROLL_BOTH ), // scroll area + MakeWidget({3, 473}, {300, 14}, WWT_PLACEHOLDER, WindowColour::Secondary, STR_NEW_RELEASE_DOWNLOAD_PAGE), // changelog button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index d2139e68c8..a4b1742b27 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -195,61 +195,61 @@ 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 */ \ - 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 */ + MakeWidget({ 0, 43}, {WW, 257}, WWT_IMGBTN, WindowColour::Secondary), /* 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[] = { MAIN_CHEATS_WIDGETS, - MakeWidget ({ 11, 48}, CHEAT_BUTTON, WWT_CHECKBOX, 1, STR_MAKE_PARK_NO_MONEY), // No money - MakeWidget ({ 5, 69}, {238, 69}, WWT_GROUPBOX, 1, STR_ADD_SET_MONEY ), // add / set money group frame - MakeSpinnerWidgets({ 11, 92}, CHEAT_SPINNER, WWT_SPINNER, 1 ), // money value - MakeWidget ({ 11, 111}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_ADD_MONEY ), // add money - MakeWidget ({127, 111}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_SET_MONEY ), // set money - MakeWidget ({ 11, 153}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_CLEAR_LOAN ), // Clear loan - MakeWidget ({ 5, 184}, {238, 101}, WWT_GROUPBOX, 1, STR_DATE_SET ), // Date group - MakeSpinnerWidgets({120, 197}, CHEAT_SPINNER, WWT_SPINNER, 1 ), // Year box - MakeSpinnerWidgets({120, 218}, CHEAT_SPINNER, WWT_SPINNER, 1 ), // Month box - MakeSpinnerWidgets({120, 239}, CHEAT_SPINNER, WWT_SPINNER, 1 ), // Day box - MakeWidget ({ 11, 258}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_DATE_SET ), // Set Date - MakeWidget ({127, 258}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_DATE_RESET ), // Reset Date + MakeWidget ({ 11, 48}, CHEAT_BUTTON, WWT_CHECKBOX, WindowColour::Secondary, STR_MAKE_PARK_NO_MONEY), // No money + MakeWidget ({ 5, 69}, {238, 69}, WWT_GROUPBOX, WindowColour::Secondary, STR_ADD_SET_MONEY ), // add / set money group frame + MakeSpinnerWidgets({ 11, 92}, CHEAT_SPINNER, WWT_SPINNER, WindowColour::Secondary ), // money value + MakeWidget ({ 11, 111}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_ADD_MONEY ), // add money + MakeWidget ({127, 111}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_SET_MONEY ), // set money + MakeWidget ({ 11, 153}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_CLEAR_LOAN ), // Clear loan + MakeWidget ({ 5, 184}, {238, 101}, WWT_GROUPBOX, WindowColour::Secondary, STR_DATE_SET ), // Date group + MakeSpinnerWidgets({120, 197}, CHEAT_SPINNER, WWT_SPINNER, WindowColour::Secondary ), // Year box + MakeSpinnerWidgets({120, 218}, CHEAT_SPINNER, WWT_SPINNER, WindowColour::Secondary ), // Month box + MakeSpinnerWidgets({120, 239}, CHEAT_SPINNER, WWT_SPINNER, WindowColour::Secondary ), // Day box + MakeWidget ({ 11, 258}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_DATE_SET ), // Set Date + MakeWidget ({127, 258}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_DATE_RESET ), // Reset Date { WIDGETS_END }, }; static rct_widget window_cheats_guests_widgets[] = { MAIN_CHEATS_WIDGETS, - MakeWidget({ 5, 48}, {238, 279}, WWT_GROUPBOX, 1, STR_CHEAT_SET_GUESTS_PARAMETERS ), // Guests parameters group frame - MakeWidget({183, 69}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MAX ), // happiness max - MakeWidget({127, 69}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MIN ), // happiness min - MakeWidget({183, 90}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MAX ), // energy max - MakeWidget({127, 90}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MIN ), // energy min - MakeWidget({183, 111}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MAX ), // hunger max - MakeWidget({127, 111}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MIN ), // hunger min - MakeWidget({183, 132}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MAX ), // thirst max - MakeWidget({127, 132}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MIN ), // thirst min - MakeWidget({183, 153}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MAX ), // nausea max - MakeWidget({127, 153}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MIN ), // nausea min - MakeWidget({183, 174}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MAX ), // nausea tolerance max - MakeWidget({127, 174}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MIN ), // nausea tolerance min - MakeWidget({183, 195}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MAX ), // toilet max - MakeWidget({127, 195}, MINMAX_BUTTON, WWT_BUTTON, 1, STR_MIN ), // toilet min - MakeWidget({127, 237}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_MORE_THAN_1 ), // ride intensity > 1 - MakeWidget({ 11, 237}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_LESS_THAN_15 ), // ride intensity < 15 - MakeWidget({ 11, 258}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_IGNORE_INTENSITY, STR_CHEAT_IGNORE_INTENSITY_TIP ), // guests ignore intensity - MakeWidget({ 11, 279}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_DISABLE_VANDALISM, STR_CHEAT_DISABLE_VANDALISM_TIP), // disable vandalism - MakeWidget({ 11, 300}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_DISABLE_LITTERING, STR_CHEAT_DISABLE_LITTERING_TIP), // disable littering - MakeWidget({ 5, 342}, {238, 69}, WWT_GROUPBOX, 1, STR_CHEAT_GIVE_ALL_GUESTS ), // Guests parameters group frame - MakeWidget({ 11, 363}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_CURRENCY_FORMAT ), // give guests money - MakeWidget({127, 363}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_SHOP_ITEM_PLURAL_PARK_MAP ), // give guests park maps - MakeWidget({ 11, 384}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_SHOP_ITEM_PLURAL_BALLOON ), // give guests balloons - MakeWidget({127, 384}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_SHOP_ITEM_PLURAL_UMBRELLA ), // give guests umbrellas - MakeWidget({ 11, 426}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_LARGE_TRAM_GUESTS, STR_CHEAT_LARGE_TRAM_GUESTS_TIP), // large tram - MakeWidget({127, 426}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_REMOVE_ALL_GUESTS, STR_CHEAT_REMOVE_ALL_GUESTS_TIP), // remove all guests - MakeWidget({ 11, 447}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_EXPLODE, STR_CHEAT_EXPLODE_TIP ), // explode guests + MakeWidget({ 5, 48}, {238, 279}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_SET_GUESTS_PARAMETERS ), // Guests parameters group frame + MakeWidget({183, 69}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MAX ), // happiness max + MakeWidget({127, 69}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MIN ), // happiness min + MakeWidget({183, 90}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MAX ), // energy max + MakeWidget({127, 90}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MIN ), // energy min + MakeWidget({183, 111}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MAX ), // hunger max + MakeWidget({127, 111}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MIN ), // hunger min + MakeWidget({183, 132}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MAX ), // thirst max + MakeWidget({127, 132}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MIN ), // thirst min + MakeWidget({183, 153}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MAX ), // nausea max + MakeWidget({127, 153}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MIN ), // nausea min + MakeWidget({183, 174}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MAX ), // nausea tolerance max + MakeWidget({127, 174}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MIN ), // nausea tolerance min + MakeWidget({183, 195}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MAX ), // toilet max + MakeWidget({127, 195}, MINMAX_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_MIN ), // toilet min + MakeWidget({127, 237}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_MORE_THAN_1 ), // ride intensity > 1 + MakeWidget({ 11, 237}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_LESS_THAN_15 ), // ride intensity < 15 + MakeWidget({ 11, 258}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_IGNORE_INTENSITY, STR_CHEAT_IGNORE_INTENSITY_TIP ), // guests ignore intensity + MakeWidget({ 11, 279}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_DISABLE_VANDALISM, STR_CHEAT_DISABLE_VANDALISM_TIP), // disable vandalism + MakeWidget({ 11, 300}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_DISABLE_LITTERING, STR_CHEAT_DISABLE_LITTERING_TIP), // disable littering + MakeWidget({ 5, 342}, {238, 69}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_GIVE_ALL_GUESTS ), // Guests parameters group frame + MakeWidget({ 11, 363}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_CURRENCY_FORMAT ), // give guests money + MakeWidget({127, 363}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_SHOP_ITEM_PLURAL_PARK_MAP ), // give guests park maps + MakeWidget({ 11, 384}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_SHOP_ITEM_PLURAL_BALLOON ), // give guests balloons + MakeWidget({127, 384}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_SHOP_ITEM_PLURAL_UMBRELLA ), // give guests umbrellas + MakeWidget({ 11, 426}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_LARGE_TRAM_GUESTS, STR_CHEAT_LARGE_TRAM_GUESTS_TIP), // large tram + MakeWidget({127, 426}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_REMOVE_ALL_GUESTS, STR_CHEAT_REMOVE_ALL_GUESTS_TIP), // remove all guests + MakeWidget({ 11, 447}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_EXPLODE, STR_CHEAT_EXPLODE_TIP ), // explode guests { WIDGETS_END }, }; @@ -257,56 +257,56 @@ static rct_widget window_cheats_guests_widgets[] = static rct_widget window_cheats_misc_widgets[] = { MAIN_CHEATS_WIDGETS, - MakeWidget ({ 5, 48}, {238, 169}, WWT_GROUPBOX, 1, STR_CHEAT_GENERAL_GROUP ), // General group - MakeWidget ({ 11, 69}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_OPEN_PARK, STR_CHEAT_OPEN_PARK_TIP ), // open / close park - MakeWidget ({ 11, 90}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CREATE_DUCKS, STR_CREATE_DUCKS_TIP ), // Create ducks - MakeWidget ({127, 69}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_PARK_PARAMETERS, STR_CHEAT_PARK_PARAMETERS_TIP ), // Park parameters - MakeWidget ({127, 90}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_REMOVE_DUCKS, STR_REMOVE_DUCKS_TIP ), // Remove ducks - MakeWidget ({ 11, 111}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_OWN_ALL_LAND, STR_CHEAT_OWN_ALL_LAND_TIP ), // Own all land - MakeWidget ({ 11, 153}, CHEAT_BUTTON, WWT_CHECKBOX, 1, STR_FORCE_PARK_RATING ), // Force park rating - MakeSpinnerWidgets({126, 155}, {111, 12}, WWT_SPINNER, 1 ), // park rating (3 widgets) - MakeWidget ({ 11, 174}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_WIN_SCENARIO ), // Win scenario - MakeWidget ({127, 174}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_HAVE_FUN ), // Have fun! - MakeWidget ({ 11, 195}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP), // never ending marketing campaigns - MakeWidget ({ 5, 221}, {238, 64}, WWT_GROUPBOX, 1, STR_CHEAT_WEATHER_GROUP ), // Weather group - MakeWidget ({ 11, 237}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_FREEZE_WEATHER, STR_CHEAT_FREEZE_WEATHER_TIP ), // Freeze weather - MakeWidget ({126, 258}, {111, 14}, WWT_DROPDOWN, 1, STR_NONE, STR_FORCE_WEATHER_TOOLTIP ), // Force weather - MakeWidget ({225, 259}, { 11, 12}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_FORCE_WEATHER_TOOLTIP ), // Force weather - MakeWidget ({ 5, 300}, {238, 132}, WWT_GROUPBOX, 1, STR_CHEAT_STAFF_GROUP ), // Staff group - MakeWidget ({ 11, 321}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_CLEAR_GRASS ), // Clear grass - MakeWidget ({127, 321}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_MOWED_GRASS ), // Mowed grass - MakeWidget ({ 11, 342}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_WATER_PLANTS ), // Water plants - MakeWidget ({127, 342}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_FIX_VANDALISM ), // Fix vandalism - MakeWidget ({ 11, 363}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_REMOVE_LITTER ), // Remove litter - MakeWidget ({ 11, 384}, CHEAT_BUTTON, WWT_CHECKBOX, 1, STR_CHEAT_DISABLE_PLANT_AGING, STR_CHEAT_DISABLE_PLANT_AGING_TIP ), // Disable plant ageing - MakeWidget ({126, 405}, {111, 14}, WWT_DROPDOWN, 1 ), // Staff speed - MakeWidget ({225, 406}, { 11, 12}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), // Staff speed + MakeWidget ({ 5, 48}, {238, 169}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_GENERAL_GROUP ), // General group + MakeWidget ({ 11, 69}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_OPEN_PARK, STR_CHEAT_OPEN_PARK_TIP ), // open / close park + MakeWidget ({ 11, 90}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CREATE_DUCKS, STR_CREATE_DUCKS_TIP ), // Create ducks + MakeWidget ({127, 69}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_PARK_PARAMETERS, STR_CHEAT_PARK_PARAMETERS_TIP ), // Park parameters + MakeWidget ({127, 90}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_REMOVE_DUCKS, STR_REMOVE_DUCKS_TIP ), // Remove ducks + MakeWidget ({ 11, 111}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_OWN_ALL_LAND, STR_CHEAT_OWN_ALL_LAND_TIP ), // Own all land + MakeWidget ({ 11, 153}, CHEAT_BUTTON, WWT_CHECKBOX, WindowColour::Secondary, STR_FORCE_PARK_RATING ), // Force park rating + MakeSpinnerWidgets({126, 155}, {111, 12}, WWT_SPINNER, WindowColour::Secondary ), // park rating (3 widgets) + MakeWidget ({ 11, 174}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_WIN_SCENARIO ), // Win scenario + MakeWidget ({127, 174}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_HAVE_FUN ), // Have fun! + MakeWidget ({ 11, 195}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP), // never ending marketing campaigns + MakeWidget ({ 5, 221}, {238, 64}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_WEATHER_GROUP ), // Weather group + MakeWidget ({ 11, 237}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_FREEZE_WEATHER, STR_CHEAT_FREEZE_WEATHER_TIP ), // Freeze weather + MakeWidget ({126, 258}, {111, 14}, WWT_DROPDOWN, WindowColour::Secondary, STR_NONE, STR_FORCE_WEATHER_TOOLTIP ), // Force weather + MakeWidget ({225, 259}, { 11, 12}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_FORCE_WEATHER_TOOLTIP ), // Force weather + MakeWidget ({ 5, 300}, {238, 132}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_STAFF_GROUP ), // Staff group + MakeWidget ({ 11, 321}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_CLEAR_GRASS ), // Clear grass + MakeWidget ({127, 321}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_MOWED_GRASS ), // Mowed grass + MakeWidget ({ 11, 342}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_WATER_PLANTS ), // Water plants + MakeWidget ({127, 342}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_FIX_VANDALISM ), // Fix vandalism + MakeWidget ({ 11, 363}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_REMOVE_LITTER ), // Remove litter + MakeWidget ({ 11, 384}, CHEAT_BUTTON, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_DISABLE_PLANT_AGING, STR_CHEAT_DISABLE_PLANT_AGING_TIP ), // Disable plant ageing + MakeWidget ({126, 405}, {111, 14}, WWT_DROPDOWN, WindowColour::Secondary ), // Staff speed + MakeWidget ({225, 406}, { 11, 12}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), // Staff speed { WIDGETS_END }, }; static rct_widget window_cheats_rides_widgets[] = { MAIN_CHEATS_WIDGETS, - MakeWidget({ 11, 48}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_FIX_ALL_RIDES, STR_CHEAT_FIX_ALL_RIDES_TIP ), // Fix all rides - MakeWidget({127, 48}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_RENEW_RIDES, STR_CHEAT_RENEW_RIDES_TIP ), // Renew rides - MakeWidget({ 11, 69}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_MAKE_DESTRUCTABLE_TIP ), // All destructible - MakeWidget({127, 69}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_RESET_CRASH_STATUS, STR_CHEAT_RESET_CRASH_STATUS_TIP ), // Reset crash status - MakeWidget({ 11, 90}, CHEAT_BUTTON, WWT_BUTTON, 1, STR_CHEAT_10_MINUTE_INSPECTIONS, STR_CHEAT_10_MINUTE_INSPECTIONS_TIP ), // 10 minute inspections - MakeWidget({ 5, 116}, {238, 101}, WWT_GROUPBOX, 1, STR_CHEAT_GROUP_CONSTRUCTION ), // Construction group - MakeWidget({ 11, 132}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_BUILD_IN_PAUSE_MODE, STR_CHEAT_BUILD_IN_PAUSE_MODE_TIP ), // Build in pause mode - MakeWidget({ 11, 153}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES_TIP ), // Show all drawable track pieces - MakeWidget({ 11, 174}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK_TIP ), // Enable chain lift on all track - MakeWidget({ 11, 195}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS_TIP), // Allow track place at invalid heights - MakeWidget({ 5, 221}, {238, 122}, WWT_GROUPBOX, 1, STR_CHEAT_GROUP_OPERATION ), // Construction group - MakeWidget({ 11, 237}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_SHOW_ALL_OPERATING_MODES ), // Show all operating modes - MakeWidget({ 11, 258}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_UNLOCK_OPERATING_LIMITS, STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP ), // 410 km/h lift hill etc. - MakeWidget({ 11, 279}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_DISABLE_BRAKES_FAILURE, STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP ), // Disable brakes failure - MakeWidget({ 11, 300}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_DISABLE_BREAKDOWNS, STR_CHEAT_DISABLE_BREAKDOWNS_TIP ), // Disable all breakdowns - MakeWidget({ 11, 321}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_DISABLE_RIDE_VALUE_AGING, STR_CHEAT_DISABLE_RIDE_VALUE_AGING_TIP ), // Disable ride ageing - MakeWidget({ 5, 347}, {238, 101}, WWT_GROUPBOX, 1, STR_CHEAT_GROUP_AVAILABILITY ), // Construction group - MakeWidget({ 11, 363}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES_TIP), // Allow arbitrary ride type changes - MakeWidget({ 11, 384}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES ), // Show vehicles from other track types - MakeWidget({ 11, 405}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT_TIP ), // Disable train length limits - MakeWidget({ 11, 426}, CHEAT_CHECK, WWT_CHECKBOX, 1, STR_CHEAT_IGNORE_RESEARCH_STATUS, STR_CHEAT_IGNORE_RESEARCH_STATUS_TIP ), // Ignore Research Status + MakeWidget({ 11, 48}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_FIX_ALL_RIDES, STR_CHEAT_FIX_ALL_RIDES_TIP ), // Fix all rides + MakeWidget({127, 48}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_RENEW_RIDES, STR_CHEAT_RENEW_RIDES_TIP ), // Renew rides + MakeWidget({ 11, 69}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_MAKE_DESTRUCTABLE, STR_CHEAT_MAKE_DESTRUCTABLE_TIP ), // All destructible + MakeWidget({127, 69}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_RESET_CRASH_STATUS, STR_CHEAT_RESET_CRASH_STATUS_TIP ), // Reset crash status + MakeWidget({ 11, 90}, CHEAT_BUTTON, WWT_BUTTON, WindowColour::Secondary, STR_CHEAT_10_MINUTE_INSPECTIONS, STR_CHEAT_10_MINUTE_INSPECTIONS_TIP ), // 10 minute inspections + MakeWidget({ 5, 116}, {238, 101}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_GROUP_CONSTRUCTION ), // Construction group + MakeWidget({ 11, 132}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_BUILD_IN_PAUSE_MODE, STR_CHEAT_BUILD_IN_PAUSE_MODE_TIP ), // Build in pause mode + MakeWidget({ 11, 153}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES, STR_CHEAT_ENABLE_ALL_DRAWABLE_TRACK_PIECES_TIP ), // Show all drawable track pieces + MakeWidget({ 11, 174}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK, STR_CHEAT_ENABLE_CHAIN_LIFT_ON_ALL_TRACK_TIP ), // Enable chain lift on all track + MakeWidget({ 11, 195}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS, STR_CHEAT_ALLOW_TRACK_PLACE_INVALID_HEIGHTS_TIP), // Allow track place at invalid heights + MakeWidget({ 5, 221}, {238, 122}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_GROUP_OPERATION ), // Construction group + MakeWidget({ 11, 237}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_SHOW_ALL_OPERATING_MODES ), // Show all operating modes + MakeWidget({ 11, 258}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_UNLOCK_OPERATING_LIMITS, STR_CHEAT_UNLOCK_OPERATING_LIMITS_TIP ), // 410 km/h lift hill etc. + MakeWidget({ 11, 279}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_DISABLE_BRAKES_FAILURE, STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP ), // Disable brakes failure + MakeWidget({ 11, 300}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_DISABLE_BREAKDOWNS, STR_CHEAT_DISABLE_BREAKDOWNS_TIP ), // Disable all breakdowns + MakeWidget({ 11, 321}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_DISABLE_RIDE_VALUE_AGING, STR_CHEAT_DISABLE_RIDE_VALUE_AGING_TIP ), // Disable ride ageing + MakeWidget({ 5, 347}, {238, 101}, WWT_GROUPBOX, WindowColour::Secondary, STR_CHEAT_GROUP_AVAILABILITY ), // Construction group + MakeWidget({ 11, 363}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES, STR_CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES_TIP), // Allow arbitrary ride type changes + MakeWidget({ 11, 384}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES ), // Show vehicles from other track types + MakeWidget({ 11, 405}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT, STR_CHEAT_DISABLE_TRAIN_LENGTH_LIMIT_TIP ), // Disable train length limits + MakeWidget({ 11, 426}, CHEAT_CHECK, WWT_CHECKBOX, WindowColour::Secondary, STR_CHEAT_IGNORE_RESEARCH_STATUS, STR_CHEAT_IGNORE_RESEARCH_STATUS_TIP ), // Ignore Research Status { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/ClearScenery.cpp b/src/openrct2-ui/windows/ClearScenery.cpp index 4ebcc54a3b..0f1aa49808 100644 --- a/src/openrct2-ui/windows/ClearScenery.cpp +++ b/src/openrct2-ui/windows/ClearScenery.cpp @@ -35,12 +35,12 @@ static constexpr const int32_t WH = 94; static rct_widget window_clear_scenery_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({27, 17}, {44, 32}, WWT_IMGBTN, 0, SPR_LAND_TOOL_SIZE_0, STR_NONE), // preview box - MakeRemapWidget({28, 18}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP), // decrement size - MakeRemapWidget({54, 32}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP), // increment size - MakeRemapWidget({ 7, 53}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_BUTTON_TREES, STR_CLEAR_SCENERY_REMOVE_SMALL_SCENERY_TIP), // small scenery - MakeRemapWidget({37, 53}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_BUTTON_LARGE_SCENERY, STR_CLEAR_SCENERY_REMOVE_LARGE_SCENERY_TIP), // large scenery - MakeRemapWidget({67, 53}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_BUTTON_FOOTPATH, STR_CLEAR_SCENERY_REMOVE_FOOTPATHS_TIP), // footpaths + MakeWidget ({27, 17}, {44, 32}, WWT_IMGBTN, WindowColour::Primary , SPR_LAND_TOOL_SIZE_0, STR_NONE), // preview box + MakeRemapWidget({28, 18}, {16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP), // decrement size + MakeRemapWidget({54, 32}, {16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP), // increment size + MakeRemapWidget({ 7, 53}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_BUTTON_TREES, STR_CLEAR_SCENERY_REMOVE_SMALL_SCENERY_TIP), // small scenery + MakeRemapWidget({37, 53}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_BUTTON_LARGE_SCENERY, STR_CLEAR_SCENERY_REMOVE_LARGE_SCENERY_TIP), // large scenery + MakeRemapWidget({67, 53}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_BUTTON_FOOTPATH, STR_CLEAR_SCENERY_REMOVE_FOOTPATHS_TIP), // footpaths { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp index a99405fc4e..37112a9bf0 100644 --- a/src/openrct2-ui/windows/CustomCurrency.cpp +++ b/src/openrct2-ui/windows/CustomCurrency.cpp @@ -35,10 +35,10 @@ enum WINDOW_CUSTOM_CURRENCY_WIDGET_IDX { static rct_widget window_custom_currency_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeSpinnerWidgets({100, 30}, {101, 11}, WWT_SPINNER, 1, STR_CHEAT_CURRENCY_FORMAT), // NB: 3 widgets - MakeWidget ({120, 50}, { 81, 11}, WWT_BUTTON, 1, STR_EMPTY ), - MakeWidget ({220, 50}, {131, 11}, WWT_DROPDOWN, 1 ), - MakeWidget ({339, 51}, { 11, 9}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeSpinnerWidgets({100, 30}, {101, 11}, WWT_SPINNER, WindowColour::Secondary, STR_CHEAT_CURRENCY_FORMAT), // NB: 3 widgets + MakeWidget ({120, 50}, { 81, 11}, WWT_BUTTON, WindowColour::Secondary, STR_EMPTY ), + MakeWidget ({220, 50}, {131, 11}, WWT_DROPDOWN, WindowColour::Secondary ), + MakeWidget ({339, 51}, { 11, 9}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index 9f44715409..bfb98a245d 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -36,12 +36,12 @@ constexpr int32_t WINDOW_WIDTH = 200; constexpr int32_t WINDOW_HEIGHT = 8 + 15 + 15 + 15 + 15 + 11 + 8; static rct_widget window_debug_paint_widgets[] = { - MakeWidget({0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT}, WWT_FRAME, 0), - MakeWidget({8, 8 + 15 * 0}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_WIDE_PATHS ), - MakeWidget({8, 8 + 15 * 1}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_BLOCKED_TILES ), - MakeWidget({8, 8 + 15 * 2}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_SEGMENT_HEIGHTS), - MakeWidget({8, 8 + 15 * 3}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_BOUND_BOXES ), - MakeWidget({8, 8 + 15 * 4}, { 185, 12}, WWT_CHECKBOX, 1, STR_DEBUG_PAINT_SHOW_DIRTY_VISUALS ), + MakeWidget({0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT}, WWT_FRAME, WindowColour::Primary ), + MakeWidget({8, 8 + 15 * 0}, { 185, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_WIDE_PATHS ), + MakeWidget({8, 8 + 15 * 1}, { 185, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_BLOCKED_TILES ), + MakeWidget({8, 8 + 15 * 2}, { 185, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_SEGMENT_HEIGHTS), + MakeWidget({8, 8 + 15 * 3}, { 185, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_BOUND_BOXES ), + MakeWidget({8, 8 + 15 * 4}, { 185, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_DEBUG_PAINT_SHOW_DIRTY_VISUALS ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp index daca7f64fa..5a6764b140 100644 --- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp +++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp @@ -34,15 +34,15 @@ enum WINDOW_RIDE_DEMOLISH_WIDGET_IDX { // 0x009AEBA0 static rct_widget window_ride_demolish_widgets[] = { WINDOW_SHIM_WHITE(STR_DEMOLISH_RIDE, WW, WH), - MakeWidget({ 10, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_DEMOLISH ), - MakeWidget({WW - 95, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_CANCEL), + MakeWidget({ 10, WH - 22}, {85, 14}, WWT_BUTTON, WindowColour::Primary, STR_DEMOLISH ), + MakeWidget({WW - 95, WH - 22}, {85, 14}, WWT_BUTTON, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL), { WIDGETS_END } }; static rct_widget window_ride_refurbish_widgets[] = { WINDOW_SHIM_WHITE(STR_REFURBISH_RIDE, WW, WH), - MakeWidget({ 10, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_REFURBISH ), - MakeWidget({WW - 95, WH - 22}, {85, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_CANCEL), + MakeWidget({ 10, WH - 22}, {85, 14}, WWT_BUTTON, WindowColour::Primary, STR_REFURBISH ), + MakeWidget({WW - 95, WH - 22}, {85, 14}, WWT_BUTTON, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index ed7652b9dd..f2d9f3857e 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -32,7 +32,7 @@ enum }; static rct_widget window_dropdown_widgets[] = { - MakeWidget({ 0, 0 }, { 1, 1 }, WWT_IMGBTN, 0), + MakeWidget({ 0, 0 }, { 1, 1 }, WWT_IMGBTN, WindowColour::Primary), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 2309657ab8..cfa2d53915 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -36,10 +36,10 @@ enum { }; static rct_widget window_editor_bottom_toolbar_widgets[] = { - 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), + MakeWidget({ 0, 0}, {200, 34}, WWT_IMGBTN, WindowColour::Primary), + MakeWidget({ 2, 2}, {196, 30}, WWT_FLATBTN, WindowColour::Primary), + MakeWidget({440, 0}, {200, 34}, WWT_IMGBTN, WindowColour::Primary), + MakeWidget({442, 2}, {196, 30}, WWT_FLATBTN, WindowColour::Primary), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp index d3ee28ef24..29cc8c52f9 100644 --- a/src/openrct2-ui/windows/EditorInventionsList.cpp +++ b/src/openrct2-ui/windows/EditorInventionsList.cpp @@ -47,19 +47,19 @@ enum { static rct_widget window_editor_inventions_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - 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), + MakeWidget({ 0, 43}, {600, 357}, WWT_RESIZE, WindowColour::Secondary ), + MakeTab ({ 3, 17} ), + MakeWidget({ 4, 56}, {368, 161}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL ), + MakeWidget({ 4, 231}, {368, 157}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL ), + MakeWidget({431, 106}, {114, 114}, WWT_FLATBTN, WindowColour::Secondary ), + MakeWidget({375, 343}, {220, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MOVE_ALL_TOP ), + MakeWidget({375, 358}, {220, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MOVE_ALL_BOTTOM ), + MakeWidget({375, 373}, {220, 14}, WWT_BUTTON, WindowColour::Secondary, STR_RANDOM_SHUFFLE, STR_RANDOM_SHUFFLE_TIP), { WIDGETS_END } }; static rct_widget window_editor_inventions_list_drag_widgets[] = { - MakeWidget({0, 0}, {150, 14}, WWT_IMGBTN, 0), + MakeWidget({0, 0}, {150, 14}, WWT_IMGBTN, WindowColour::Primary), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/EditorMain.cpp b/src/openrct2-ui/windows/EditorMain.cpp index 7044160fee..12943fcb3a 100644 --- a/src/openrct2-ui/windows/EditorMain.cpp +++ b/src/openrct2-ui/windows/EditorMain.cpp @@ -49,7 +49,7 @@ static rct_window_event_list window_editor_main_events = { }; static rct_widget window_editor_main_widgets[] = { - MakeWidget({ 0, 0 }, { 0, 0 }, WWT_VIEWPORT, 0, STR_VIEWPORT), + MakeWidget({ 0, 0 }, { 0, 0 }, WWT_VIEWPORT, WindowColour::Primary, STR_VIEWPORT), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 35307bd275..131e76db47 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 ), - 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 ), + MakeWidget({ 0, 43}, {600, 357}, WWT_RESIZE, WindowColour::Secondary ), + MakeWidget({470, 22}, {122, 14}, WWT_BUTTON, WindowColour::Primary, STR_OBJECT_SELECTION_ADVANCED, STR_OBJECT_SELECTION_ADVANCED_TIP), + MakeWidget({ 4, 60}, {288, 327}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL ), + MakeWidget({391, 45}, {114, 115}, WWT_FLATBTN, WindowColour::Secondary ), + MakeWidget({470, 22}, {122, 14}, WWT_BUTTON, WindowColour::Primary, STR_INSTALL_NEW_TRACK_DESIGN, STR_INSTALL_NEW_TRACK_DESIGN_TIP ), + MakeWidget({350, 22}, {114, 14}, WWT_BUTTON, WindowColour::Primary, STR_OBJECT_FILTER, STR_OBJECT_FILTER_TIP ), + MakeWidget({ 4, 45}, {211, 14}, WWT_TEXT_BOX, WindowColour::Secondary ), + MakeWidget({218, 45}, { 70, 14}, WWT_BUTTON, WindowColour::Secondary, STR_OBJECT_SEARCH_CLEAR ), + MakeWidget({ 3, 73}, {285, 4}, WWT_IMGBTN, WindowColour::Secondary ), + 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, WindowColour::Secondary ), + MakeWidget({149, 80}, {143, 14}, WWT_TABLE_HEADER, WindowColour::Secondary ), - MakeTab ({ 3, 17}, 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 ee4c8bfb78..e9daf838e8 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -87,27 +87,27 @@ enum { #define MAIN_OBJECTIVE_OPTIONS_WIDGETS \ WINDOW_SHIM(WINDOW_TITLE, WW, WH), \ - 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 ) + MakeWidget({ 0, 43}, {280, 106}, WWT_RESIZE, WindowColour::Secondary), \ + 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, - MakeWidget ({ 98, 48}, {344, 12}, WWT_DROPDOWN, 1, STR_NONE, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), - MakeWidget ({430, 49}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), - MakeSpinnerWidgets({158, 65}, {120, 12}, WWT_BUTTON, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({158, 82}, {120, 12}, WWT_BUTTON, 1 ), // NB: 3 widgets - MakeWidget ({370, 99}, { 75, 12}, WWT_BUTTON, 1, STR_CHANGE, STR_CHANGE_NAME_OF_PARK_TIP ), - MakeWidget ({370, 116}, { 75, 12}, WWT_BUTTON, 1, STR_CHANGE, STR_CHANGE_NAME_OF_SCENARIO_TIP ), - MakeWidget ({ 98, 133}, {180, 12}, WWT_DROPDOWN, 1, STR_NONE, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), - MakeWidget ({266, 134}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), - MakeWidget ({370, 150}, { 75, 12}, WWT_BUTTON, 1, STR_CHANGE, STR_CHANGE_DETAIL_NOTES_ABOUT_PARK_SCENARIO_TIP), + MakeWidget ({ 98, 48}, {344, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_NONE, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), + MakeWidget ({430, 49}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP ), + MakeSpinnerWidgets({158, 65}, {120, 12}, WWT_BUTTON, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({158, 82}, {120, 12}, WWT_BUTTON, WindowColour::Secondary ), // NB: 3 widgets + MakeWidget ({370, 99}, { 75, 12}, WWT_BUTTON, WindowColour::Secondary, STR_CHANGE, STR_CHANGE_NAME_OF_PARK_TIP ), + MakeWidget ({370, 116}, { 75, 12}, WWT_BUTTON, WindowColour::Secondary, STR_CHANGE, STR_CHANGE_NAME_OF_SCENARIO_TIP ), + MakeWidget ({ 98, 133}, {180, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_NONE, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), + MakeWidget ({266, 134}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN), + MakeWidget ({370, 150}, { 75, 12}, WWT_BUTTON, WindowColour::Secondary, STR_CHANGE, STR_CHANGE_DETAIL_NOTES_ABOUT_PARK_SCENARIO_TIP), { WIDGETS_END } }; static rct_widget window_editor_objective_options_rides_widgets[] = { MAIN_OBJECTIVE_OPTIONS_WIDGETS, - MakeWidget({ 3, 60}, {374, 161}, WWT_SCROLL, 1, SCROLL_VERTICAL), + MakeWidget({ 3, 60}, {374, 161}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp index 6ab898f883..1efe4176b8 100644 --- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp +++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp @@ -119,52 +119,52 @@ 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), - 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 - MakeSpinnerWidgets({168, 99}, { 100, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({168, 116}, { 70, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeWidget ({ 8, 133}, {WW_FINANCIAL - 16, 12}, WWT_CHECKBOX, 1, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP ), + MakeWidget ({ 0, 43}, { WW_FINANCIAL, 106}, WWT_RESIZE, WindowColour::Secondary ), + 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, WindowColour::Secondary, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP ), + MakeSpinnerWidgets({168, 65}, { 100, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({168, 82}, { 100, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({168, 99}, { 100, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({168, 116}, { 70, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeWidget ({ 8, 133}, {WW_FINANCIAL - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP ), { WIDGETS_END } }; static rct_widget window_editor_scenario_options_guests_widgets[] = { WINDOW_SHIM(STR_SCENARIO_OPTIONS_GUESTS, WW_GUESTS, WH_GUESTS), - MakeWidget ({ 0, 43}, { WW_GUESTS, 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 ), - MakeSpinnerWidgets({268, 48}, { 70, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({268, 65}, { 70, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({268, 82}, { 70, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({268, 99}, { 70, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeWidget ({ 8, 116}, {WW_GUESTS - 16, 12}, WWT_CHECKBOX, 1, STR_GUESTS_PREFER_LESS_INTENSE_RIDES, STR_GUESTS_PREFER_LESS_INTENSE_RIDES_TIP), - MakeWidget ({ 8, 133}, {WW_GUESTS - 16, 12}, WWT_CHECKBOX, 1, STR_GUESTS_PREFER_MORE_INTENSE_RIDES, STR_GUESTS_PREFER_MORE_INTENSE_RIDES_TIP), + MakeWidget ({ 0, 43}, { WW_GUESTS, 106}, WWT_RESIZE, WindowColour::Secondary), + MakeRemapWidget ({ 3, 17}, { 31, 27}, WWT_TAB, WindowColour::Secondary, SPR_TAB, STR_SCENARIO_OPTIONS_FINANCIAL_TIP ), + MakeRemapWidget ({ 34, 17}, { 31, 30}, WWT_TAB, WindowColour::Secondary, SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP ), + MakeRemapWidget ({ 65, 17}, { 31, 27}, WWT_TAB, WindowColour::Secondary, SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP ), + MakeSpinnerWidgets({268, 48}, { 70, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({268, 65}, { 70, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({268, 82}, { 70, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({268, 99}, { 70, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeWidget ({ 8, 116}, {WW_GUESTS - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_GUESTS_PREFER_LESS_INTENSE_RIDES, STR_GUESTS_PREFER_LESS_INTENSE_RIDES_TIP), + MakeWidget ({ 8, 133}, {WW_GUESTS - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_GUESTS_PREFER_MORE_INTENSE_RIDES, STR_GUESTS_PREFER_MORE_INTENSE_RIDES_TIP), { WIDGETS_END } }; static rct_widget window_editor_scenario_options_park_widgets[] = { WINDOW_SHIM(STR_SCENARIO_OPTIONS_PARK, WW_PARK, WH_PARK), - MakeWidget ({ 0, 43}, { WW_PARK, 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 ), - MakeSpinnerWidgets({188, 48}, { 70, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({188, 65}, { 70, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeWidget ({ 8, 82}, { 210, 12}, WWT_DROPDOWN, 1, STR_NONE, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), - MakeWidget ({206, 83}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), - MakeSpinnerWidgets({328, 82}, { 67, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeWidget ({188, 99}, { 207, 12}, WWT_DROPDOWN, 1, STR_NONE, STR_SELECT_CLIMATE_TIP ), - MakeWidget ({383, 100}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_CLIMATE_TIP ), - MakeWidget ({ 8, 116}, {WW_PARK - 16, 12}, WWT_CHECKBOX, 1, STR_FORBID_TREE_REMOVAL, STR_FORBID_TREE_REMOVAL_TIP ), - MakeWidget ({ 8, 133}, {WW_PARK - 16, 12}, WWT_CHECKBOX, 1, STR_FORBID_LANDSCAPE_CHANGES, STR_FORBID_LANDSCAPE_CHANGES_TIP ), - MakeWidget ({ 8, 150}, {WW_PARK - 16, 12}, WWT_CHECKBOX, 1, STR_FORBID_HIGH_CONSTRUCTION, STR_FORBID_HIGH_CONSTRUCTION_TIP ), - MakeWidget ({ 8, 167}, {WW_PARK - 16, 12}, WWT_CHECKBOX, 1, STR_HARD_PARK_RATING, STR_HARD_PARK_RATING_TIP ), - MakeWidget ({ 8, 184}, {WW_PARK - 16, 12}, WWT_CHECKBOX, 1, STR_HARD_GUEST_GENERATION, STR_HARD_GUEST_GENERATION_TIP ), + MakeWidget ({ 0, 43}, { WW_PARK, 106}, WWT_RESIZE, WindowColour::Secondary ), + MakeRemapWidget ({ 3, 17}, { 31, 27}, WWT_TAB, WindowColour::Secondary, SPR_TAB, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), + MakeRemapWidget ({ 34, 17}, { 31, 30}, WWT_TAB, WindowColour::Secondary, SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP ), + MakeRemapWidget ({ 65, 17}, { 31, 27}, WWT_TAB, WindowColour::Secondary, SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP ), + MakeSpinnerWidgets({188, 48}, { 70, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({188, 65}, { 70, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeWidget ({ 8, 82}, { 210, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_NONE, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), + MakeWidget ({206, 83}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP), + MakeSpinnerWidgets({328, 82}, { 67, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeWidget ({188, 99}, { 207, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_NONE, STR_SELECT_CLIMATE_TIP ), + MakeWidget ({383, 100}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_CLIMATE_TIP ), + MakeWidget ({ 8, 116}, {WW_PARK - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_FORBID_TREE_REMOVAL, STR_FORBID_TREE_REMOVAL_TIP ), + MakeWidget ({ 8, 133}, {WW_PARK - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_FORBID_LANDSCAPE_CHANGES, STR_FORBID_LANDSCAPE_CHANGES_TIP ), + MakeWidget ({ 8, 150}, {WW_PARK - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_FORBID_HIGH_CONSTRUCTION, STR_FORBID_HIGH_CONSTRUCTION_TIP ), + MakeWidget ({ 8, 167}, {WW_PARK - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_HARD_PARK_RATING, STR_HARD_PARK_RATING_TIP ), + MakeWidget ({ 8, 184}, {WW_PARK - 16, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_HARD_GUEST_GENERATION, STR_HARD_GUEST_GENERATION_TIP ), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index e4b86e77d4..ddd6dcd746 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -23,7 +23,7 @@ enum { }; static rct_widget window_error_widgets[] = { - MakeWidget({0, 0}, {200, 42}, WWT_IMGBTN, 0), + MakeWidget({0, 0}, {200, 42}, WWT_IMGBTN, WindowColour::Primary), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 879fa9025f..031bc99dcd 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -96,17 +96,17 @@ enum static rct_widget _windowFinancesSummaryWidgets[] = { WINDOW_SHIM(STR_FINANCIAL_SUMMARY, WW_OTHER_TABS, WH_SUMMARY), - MakeWidget ({ 0, 43}, {530, 266}, WWT_RESIZE, 1), + MakeWidget ({ 0, 43}, {530, 266}, WWT_RESIZE, WindowColour::Secondary), TAB_WIDGETS, - MakeWidget ({130, 50}, {391, 211}, WWT_SCROLL, 1, SCROLL_HORIZONTAL ), - MakeSpinnerWidgets({ 64, 279}, { 97, 14}, WWT_SPINNER, 1, STR_FINANCES_SUMMARY_LOAN_VALUE), // NB: 3 widgets. + MakeWidget ({130, 50}, {391, 211}, WWT_SCROLL, WindowColour::Secondary, SCROLL_HORIZONTAL ), + MakeSpinnerWidgets({ 64, 279}, { 97, 14}, WWT_SPINNER, WindowColour::Secondary, STR_FINANCES_SUMMARY_LOAN_VALUE), // NB: 3 widgets. { WIDGETS_END }, }; static rct_widget _windowFinancesCashWidgets[] = { WINDOW_SHIM(STR_FINANCIAL_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS), - MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), + MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, WindowColour::Secondary), TAB_WIDGETS, { WIDGETS_END }, }; @@ -114,7 +114,7 @@ static rct_widget _windowFinancesCashWidgets[] = static rct_widget _windowFinancesParkValueWidgets[] = { WINDOW_SHIM(STR_PARK_VALUE_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS), - MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), + MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, WindowColour::Secondary), TAB_WIDGETS, { WIDGETS_END }, }; @@ -122,7 +122,7 @@ static rct_widget _windowFinancesParkValueWidgets[] = static rct_widget _windowFinancesProfitWidgets[] = { WINDOW_SHIM(STR_PROFIT_GRAPH, WW_OTHER_TABS, WH_OTHER_TABS), - MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), + MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, WindowColour::Secondary), TAB_WIDGETS, { WIDGETS_END }, }; @@ -130,35 +130,35 @@ static rct_widget _windowFinancesProfitWidgets[] = static rct_widget _windowFinancesMarketingWidgets[] = { WINDOW_SHIM(STR_MARKETING, WW_OTHER_TABS, WH_OTHER_TABS), - MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, 1), + MakeWidget({0, 43}, {WW_OTHER_TABS, 214}, WWT_RESIZE, WindowColour::Secondary), TAB_WIDGETS, - 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), + MakeWidget({3, 47}, { WW_OTHER_TABS - 6, 45}, WWT_GROUPBOX, WindowColour::Tertiary , STR_MARKETING_CAMPAIGNS_IN_OPERATION ), + MakeWidget({3, 47}, { WW_OTHER_TABS - 6, 206}, WWT_GROUPBOX, WindowColour::Tertiary , STR_MARKETING_CAMPAIGNS_AVAILABLE ), + MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), + MakeWidget({8, 0}, {WW_OTHER_TABS - 16, 14}, WWT_IMGBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_START_THIS_MARKETING_CAMPAIGN), { WIDGETS_END }, }; static rct_widget _windowFinancesResearchWidgets[] = { WINDOW_SHIM(STR_RESEARCH_FUNDING, WW_RESEARCH, WH_RESEARCH), - MakeWidget({0, 43}, {WW_RESEARCH, 164}, WWT_RESIZE, 1), + MakeWidget({0, 43}, {WW_RESEARCH, 164}, WWT_RESIZE, WindowColour::Secondary), TAB_WIDGETS, - 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 ), + MakeWidget({ 3, 47}, { WW_RESEARCH - 6, 45}, WWT_GROUPBOX, WindowColour::Tertiary, STR_RESEARCH_FUNDING_ ), + MakeWidget({ 8, 59}, { 160, 14}, WWT_DROPDOWN, WindowColour::Tertiary, 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + MakeWidget({156, 60}, { 11, 12}, WWT_BUTTON, WindowColour::Tertiary, STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + MakeWidget({ 3, 96}, { WW_RESEARCH - 6, 107}, WWT_GROUPBOX, WindowColour::Tertiary, STR_RESEARCH_PRIORITIES ), + MakeWidget({ 8, 108}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, WindowColour::Tertiary, STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), + MakeWidget({ 8, 121}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, WindowColour::Tertiary, STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), + MakeWidget({ 8, 134}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, WindowColour::Tertiary, STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), + MakeWidget({ 8, 147}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, WindowColour::Tertiary, STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), + MakeWidget({ 8, 160}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, WindowColour::Tertiary, STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), + MakeWidget({ 8, 173}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, WindowColour::Tertiary, STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), + MakeWidget({ 8, 186}, {WW_RESEARCH - 14, 12}, WWT_CHECKBOX, WindowColour::Tertiary, STR_RESEARCH_NEW_SCENERY_AND_THEMING, STR_RESEARCH_NEW_SCENERY_AND_THEMING_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 77971956f0..d310621c1c 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -74,29 +74,29 @@ static rct_widget window_footpath_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), // Type group - 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 ), + MakeWidget({ 3, 17}, {100, 55}, WWT_GROUPBOX, WindowColour::Primary , STR_TYPE ), + MakeWidget({ 6, 30}, { 47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_FOOTPATH_TIP ), + MakeWidget({53, 30}, { 47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_QUEUE_LINE_PATH_TIP ), // Direction group - 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 ), + MakeWidget({ 3, 75}, {100, 77}, WWT_GROUPBOX, WindowColour::Primary , STR_DIRECTION ), + MakeWidget({53, 87}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_NE, STR_DIRECTION_TIP ), + MakeWidget({53, 116}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_SE, STR_DIRECTION_TIP ), + MakeWidget({ 8, 116}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_SW, STR_DIRECTION_TIP ), + MakeWidget({ 8, 87}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_NW, STR_DIRECTION_TIP ), // Slope group - 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 ), + MakeWidget({ 3, 155}, {100, 41}, WWT_GROUPBOX, WindowColour::Primary , STR_SLOPE ), + MakeWidget({17, 167}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN, STR_SLOPE_DOWN_TIP ), + MakeWidget({41, 167}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL, STR_LEVEL_TIP ), + MakeWidget({65, 167}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_SLOPE_UP_TIP ), + MakeWidget({ 8, 202}, { 90, 90}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_CONSTRUCT_THE_SELECTED_FOOTPATH_SECTION_TIP), + MakeWidget({30, 295}, { 46, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH_CURRENT_SECTION, STR_REMOVE_PREVIOUS_FOOTPATH_SECTION_TIP ), // Mode group - 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 ), + MakeWidget({ 3, 321}, {100, 54}, WWT_GROUPBOX, WindowColour::Primary ), + MakeWidget({13, 332}, { 36, 36}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_FOOTPATH_LAND, STR_CONSTRUCT_FOOTPATH_ON_LAND_TIP ), + MakeWidget({57, 332}, { 36, 36}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_FOOTPATH_BRIDGE, STR_CONSTRUCT_BRIDGE_OR_TUNNEL_FOOTPATH_TIP ), {WIDGETS_END}, }; diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp index 67c26d8792..5e2164bc4a 100644 --- a/src/openrct2-ui/windows/GameBottomToolbar.cpp +++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp @@ -48,20 +48,20 @@ enum WINDOW_GAME_BOTTOM_TOOLBAR_WIDGET_IDX static rct_widget window_game_bottom_toolbar_widgets[] = { - 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 + MakeWidget({ 0, 0}, {142, 34}, WWT_IMGBTN, WindowColour::Primary ), // Left outset panel + MakeWidget({ 2, 2}, {138, 30}, WWT_IMGBTN, WindowColour::Primary ), // Left inset panel + MakeWidget({ 2, 1}, {138, 12}, WWT_FLATBTN, WindowColour::Primary , 0xFFFFFFFF, STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP), // Money window + MakeWidget({ 2, 11}, {138, 12}, WWT_FLATBTN, WindowColour::Primary ), // Guests window + MakeWidget({ 2, 21}, {138, 11}, WWT_FLATBTN, WindowColour::Primary , 0xFFFFFFFF, STR_PARK_RATING_TIP ), // Park rating window - 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 + MakeWidget({142, 0}, {356, 34}, WWT_IMGBTN, WindowColour::Tertiary ), // Middle outset panel + MakeWidget({144, 2}, {352, 30}, WWT_PLACEHOLDER, WindowColour::Tertiary ), // Middle inset panel + MakeWidget({147, 5}, { 24, 24}, WWT_FLATBTN, WindowColour::Tertiary, 0xFFFFFFFF, STR_SHOW_SUBJECT_TIP ), // Associated news item window + MakeWidget({469, 5}, { 24, 24}, WWT_FLATBTN, WindowColour::Tertiary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // Scroll to news item target - 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 + MakeWidget({498, 0}, {142, 34}, WWT_IMGBTN, WindowColour::Primary ), // Right outset panel + MakeWidget({500, 2}, {138, 30}, WWT_IMGBTN, WindowColour::Primary ), // Right inset panel + MakeWidget({500, 2}, {138, 12}, WWT_FLATBTN, WindowColour::Primary ), // Date { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 67c9bb63d0..2c51da29b8 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -76,24 +76,24 @@ 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 */ \ - 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 */ + MakeWidget({ 0, 43}, {192, 114}, WWT_RESIZE, WindowColour::Secondary), /* 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, - MakeWidget({ 3, 45}, {164, 12}, WWT_LABEL_CENTRED, 1 ), // Label Thought marquee - MakeWidget({ 3, 57}, {164, 87}, WWT_VIEWPORT, 1 ), // Viewport - MakeWidget({ 3, 144}, {164, 11}, WWT_LABEL_CENTRED, 1 ), // Label Action - MakeWidget({167, 45}, { 24, 24}, WWT_FLATBTN, 1, SPR_PICKUP_BTN, STR_PICKUP_TIP ), // Pickup Button - MakeWidget({167, 69}, { 24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_NAME_GUEST_TIP ), // Rename Button - MakeWidget({167, 93}, { 24, 24}, WWT_FLATBTN, 1, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // Locate Button - MakeWidget({167, 117}, { 24, 24}, WWT_FLATBTN, 1, SPR_TRACK_PEEP, STR_TOGGLE_GUEST_TRACKING_TIP), // Track Button + MakeWidget({ 3, 45}, {164, 12}, WWT_LABEL_CENTRED, WindowColour::Secondary ), // Label Thought marquee + MakeWidget({ 3, 57}, {164, 87}, WWT_VIEWPORT, WindowColour::Secondary ), // Viewport + MakeWidget({ 3, 144}, {164, 11}, WWT_LABEL_CENTRED, WindowColour::Secondary ), // Label Action + MakeWidget({167, 45}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PICKUP_BTN, STR_PICKUP_TIP ), // Pickup Button + MakeWidget({167, 69}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RENAME, STR_NAME_GUEST_TIP ), // Rename Button + MakeWidget({167, 93}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // Locate Button + MakeWidget({167, 117}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_TRACK_PEEP, STR_TOGGLE_GUEST_TRACKING_TIP), // Track Button { WIDGETS_END }, }; @@ -104,7 +104,7 @@ static rct_widget window_guest_stats_widgets[] = { static rct_widget window_guest_rides_widgets[] = { MAIN_GUEST_WIDGETS, - MakeWidget({3, 57}, {186, 87}, WWT_SCROLL, 1, SCROLL_VERTICAL), + MakeWidget({3, 57}, {186, 87}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp index 02746d4c70..45577183ab 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 - 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 + MakeWidget({ 0, 43}, {350, 287}, WWT_RESIZE, WindowColour::Secondary ), // tab content panel + MakeWidget({ 5, 59}, { 80, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_ARG_4_PAGE_X ), // page dropdown + MakeWidget({ 73, 60}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), // page dropdown button + MakeWidget({120, 59}, {142, 12}, WWT_DROPDOWN, WindowColour::Secondary, 0xFFFFFFFF, STR_INFORMATION_TYPE_TIP ), // information type dropdown + MakeWidget({250, 60}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_INFORMATION_TYPE_TIP ), // information type dropdown button + MakeWidget({273, 46}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_MAP, STR_SHOW_GUESTS_ON_MAP_TIP ), // map + MakeWidget({297, 46}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_SEARCH, STR_GUESTS_FILTER_BY_NAME_TIP), // filter by name + MakeWidget({321, 46}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, 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, WindowColour::Secondary, SCROLL_BOTH ), // guest list { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 5c75af5cc3..7dfd8d42c5 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -43,11 +43,11 @@ constexpr int32_t ACTION_BUTTONS_LEFT = WW - 100; static rct_widget window_install_track_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 4, 18}, {372, 219}, WWT_FLATBTN, 0 ), - MakeWidget({PREVIEW_BUTTONS_LEFT, 422}, { 22, 24}, WWT_FLATBTN, 0, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), - MakeWidget({PREVIEW_BUTTONS_LEFT, 398}, { 22, 24}, WWT_FLATBTN, 0, SPR_SCENERY, STR_TOGGLE_SCENERY_TIP), - MakeWidget({ ACTION_BUTTONS_LEFT, 241}, { 97, 15}, WWT_BUTTON, 0, STR_INSTALL_NEW_TRACK_DESIGN_INSTALL ), - MakeWidget({ ACTION_BUTTONS_LEFT, 259}, { 97, 15}, WWT_BUTTON, 0, STR_INSTALL_NEW_TRACK_DESIGN_CANCEL ), + MakeWidget({ 4, 18}, {372, 219}, WWT_FLATBTN, WindowColour::Primary ), + MakeWidget({PREVIEW_BUTTONS_LEFT, 422}, { 22, 24}, WWT_FLATBTN, WindowColour::Primary, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), + MakeWidget({PREVIEW_BUTTONS_LEFT, 398}, { 22, 24}, WWT_FLATBTN, WindowColour::Primary, SPR_SCENERY, STR_TOGGLE_SCENERY_TIP), + MakeWidget({ ACTION_BUTTONS_LEFT, 241}, { 97, 15}, WWT_BUTTON, WindowColour::Primary, STR_INSTALL_NEW_TRACK_DESIGN_INSTALL ), + MakeWidget({ ACTION_BUTTONS_LEFT, 259}, { 97, 15}, WWT_BUTTON, WindowColour::Primary, STR_INSTALL_NEW_TRACK_DESIGN_CANCEL ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Land.cpp b/src/openrct2-ui/windows/Land.cpp index 5750ae401e..a551f4253a 100644 --- a/src/openrct2-ui/windows/Land.cpp +++ b/src/openrct2-ui/windows/Land.cpp @@ -43,13 +43,13 @@ enum WINDOW_LAND_WIDGET_IDX { static rct_widget window_land_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({19, 19}, {24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_ENABLE_MOUNTAIN_TOOL_TIP), // mountain mode - MakeWidget ({55, 19}, {24, 24}, WWT_FLATBTN, 1, SPR_PAINTBRUSH, STR_DISABLE_ELEVATION), // paint mode - MakeWidget ({27, 48}, {44, 32}, WWT_IMGBTN, 0, SPR_LAND_TOOL_SIZE_0, STR_NONE), // preview box - MakeRemapWidget({28, 49}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP), // decrement size - MakeRemapWidget({54, 63}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP), // increment size - MakeWidget ({ 2, 106}, {47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP), // floor texture - MakeWidget ({49, 106}, {47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), // wall texture + MakeWidget ({19, 19}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_ENABLE_MOUNTAIN_TOOL_TIP), // mountain mode + MakeWidget ({55, 19}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PAINTBRUSH, STR_DISABLE_ELEVATION), // paint mode + MakeWidget ({27, 48}, {44, 32}, WWT_IMGBTN, WindowColour::Primary , SPR_LAND_TOOL_SIZE_0, STR_NONE), // preview box + MakeRemapWidget({28, 49}, {16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP), // decrement size + MakeRemapWidget({54, 63}, {16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP), // increment size + MakeWidget ({ 2, 106}, {47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP), // floor texture + MakeWidget ({49, 106}, {47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), // wall texture { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp index 5844f66bb6..17e2888f62 100644 --- a/src/openrct2-ui/windows/LandRights.cpp +++ b/src/openrct2-ui/windows/LandRights.cpp @@ -38,11 +38,11 @@ enum WINDOW_WATER_WIDGET_IDX { static rct_widget window_land_rights_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({27, 17}, {44, 32}, WWT_IMGBTN, 0, SPR_LAND_TOOL_SIZE_0 ), // preview box - MakeRemapWidget({28, 18}, {16, 16}, WWT_TRNBTN, 2, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_RIGHTS_TIP), // decrement size - MakeRemapWidget({54, 32}, {16, 16}, WWT_TRNBTN, 2, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP ), // increment size - MakeRemapWidget({22, 53}, {24, 24}, WWT_FLATBTN, 2, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_RIGHTS_TIP ), // land rights - MakeRemapWidget({52, 53}, {24, 24}, WWT_FLATBTN, 2, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUY_CONSTRUCTION_RIGHTS_TIP ), // construction rights + MakeWidget ({27, 17}, {44, 32}, WWT_IMGBTN, WindowColour::Primary , SPR_LAND_TOOL_SIZE_0 ), // preview box + MakeRemapWidget({28, 18}, {16, 16}, WWT_TRNBTN, WindowColour::Tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_RIGHTS_TIP), // decrement size + MakeRemapWidget({54, 32}, {16, 16}, WWT_TRNBTN, WindowColour::Tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_RIGHTS_TIP ), // increment size + MakeRemapWidget({22, 53}, {24, 24}, WWT_FLATBTN, WindowColour::Tertiary, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_RIGHTS_TIP ), // land rights + MakeRemapWidget({52, 53}, {24, 24}, WWT_FLATBTN, WindowColour::Tertiary, SPR_BUY_CONSTRUCTION_RIGHTS, STR_BUY_CONSTRUCTION_RIGHTS_TIP ), // construction rights { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index 8f081e9ecd..49f1a23791 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -63,15 +63,15 @@ enum static rct_widget window_loadsave_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 0, WH - 1}, { WW, 1}, WWT_RESIZE, 1 ), // tab content panel - MakeWidget({ 4, 36}, { 84, 14}, WWT_BUTTON, 0, STR_LOADSAVE_DEFAULT, STR_LOADSAVE_DEFAULT_TIP), // Go to default directory - MakeWidget({ 88, 36}, { 84, 14}, WWT_BUTTON, 0, STR_FILEBROWSER_ACTION_UP ), // Up - MakeWidget({ 172, 36}, { 87, 14}, WWT_BUTTON, 0, STR_FILEBROWSER_ACTION_NEW_FOLDER ), // New - MakeWidget({ 259, 36}, { 87, 14}, WWT_BUTTON, 0, STR_FILEBROWSER_ACTION_NEW_FILE ), // New - MakeWidget({ 4, 55}, {170, 14}, WWT_TABLE_HEADER, 0 ), // Name - MakeWidget({(WW - 5) / 2 + 1, 55}, {170, 14}, WWT_TABLE_HEADER, 0 ), // Date - MakeWidget({ 4, 68}, {342, 303}, WWT_SCROLL, 0, SCROLL_VERTICAL ), // File list - MakeWidget({ 4, WH - 24}, {197, 19}, WWT_BUTTON, 0, STR_FILEBROWSER_USE_SYSTEM_WINDOW ), // Use native browser + MakeWidget({ 0, WH - 1}, { WW, 1}, WWT_RESIZE, WindowColour::Secondary ), // tab content panel + MakeWidget({ 4, 36}, { 84, 14}, WWT_BUTTON, WindowColour::Primary , STR_LOADSAVE_DEFAULT, STR_LOADSAVE_DEFAULT_TIP), // Go to default directory + MakeWidget({ 88, 36}, { 84, 14}, WWT_BUTTON, WindowColour::Primary , STR_FILEBROWSER_ACTION_UP ), // Up + MakeWidget({ 172, 36}, { 87, 14}, WWT_BUTTON, WindowColour::Primary , STR_FILEBROWSER_ACTION_NEW_FOLDER ), // New + MakeWidget({ 259, 36}, { 87, 14}, WWT_BUTTON, WindowColour::Primary , STR_FILEBROWSER_ACTION_NEW_FILE ), // New + MakeWidget({ 4, 55}, {170, 14}, WWT_TABLE_HEADER, WindowColour::Primary ), // Name + MakeWidget({(WW - 5) / 2 + 1, 55}, {170, 14}, WWT_TABLE_HEADER, WindowColour::Primary ), // Date + MakeWidget({ 4, 68}, {342, 303}, WWT_SCROLL, WindowColour::Primary , SCROLL_VERTICAL ), // File list + MakeWidget({ 4, WH - 24}, {197, 19}, WWT_BUTTON, WindowColour::Primary , STR_FILEBROWSER_USE_SYSTEM_WINDOW ), // Use native browser { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp index c9b548bc93..68ec0c7b22 100644 --- a/src/openrct2-ui/windows/Main.cpp +++ b/src/openrct2-ui/windows/Main.cpp @@ -17,7 +17,7 @@ // clang-format off static rct_widget window_main_widgets[] = { - MakeWidget({0, 0}, {0, 0}, WWT_VIEWPORT, 0, STR_VIEWPORT), + MakeWidget({0, 0}, {0, 0}, WWT_VIEWPORT, WindowColour::Primary, STR_VIEWPORT), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 1087359f24..43f17361d8 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -81,23 +81,23 @@ validate_global_widx(WC_MAP, WIDX_ROTATE_90); static rct_widget window_map_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 43}, {245, 215}, WWT_RESIZE, 1 ), - MakeRemapWidget ({ 3, 17}, { 31, 27}, WWT_COLOURBTN, 1, SPR_TAB, STR_SHOW_PEOPLE_ON_MAP_TIP ), - MakeRemapWidget ({ 34, 17}, { 31, 27}, WWT_COLOURBTN, 1, SPR_TAB, STR_SHOW_RIDES_STALLS_ON_MAP_TIP ), - MakeWidget ({ 3, 46}, {239, 180}, WWT_SCROLL, 1, SCROLL_BOTH ), - MakeSpinnerWidgets({104, 229}, { 95, 12}, WWT_SPINNER, 1, STR_MAP_SIZE_VALUE ), // NB: 3 widgets - MakeWidget ({ 4, 1}, { 24, 24}, WWT_FLATBTN, 1, SPR_BUY_LAND_RIGHTS, STR_SELECT_PARK_OWNED_LAND_TIP ), - MakeWidget ({ 4, 1}, { 24, 24}, WWT_FLATBTN, 1, SPR_PARK_ENTRANCE, STR_BUILD_PARK_ENTRANCE_TIP ), - MakeWidget ({ 28, 1}, { 24, 24}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_SET_STARTING_POSITIONS_TIP ), - MakeWidget ({ 4, 17}, { 44, 32}, WWT_IMGBTN, 1, SPR_LAND_TOOL_SIZE_0 ), - MakeRemapWidget ({ 5, 18}, { 16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), - MakeRemapWidget ({ 31, 32}, { 16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), - MakeWidget ({ 58, 197}, {184, 12}, WWT_CHECKBOX, 1, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP ), - MakeWidget ({ 58, 197}, {184, 12}, WWT_CHECKBOX, 1, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP ), - MakeWidget ({ 58, 197}, {184, 12}, WWT_CHECKBOX, 1, STR_LAND_SALE, STR_SET_LAND_TO_BE_AVAILABLE_TIP ), - MakeWidget ({ 58, 197}, {174, 12}, WWT_CHECKBOX, 1, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP), - MakeWidget ({218, 45}, { 24, 24}, WWT_FLATBTN, 1, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 ), - MakeWidget ({110, 189}, {131, 14}, WWT_BUTTON, 1, STR_MAPGEN_WINDOW_TITLE, STR_MAP_GENERATOR_TIP ), + MakeWidget ({ 0, 43}, {245, 215}, WWT_RESIZE, WindowColour::Secondary ), + MakeRemapWidget ({ 3, 17}, { 31, 27}, WWT_COLOURBTN, WindowColour::Secondary, SPR_TAB, STR_SHOW_PEOPLE_ON_MAP_TIP ), + MakeRemapWidget ({ 34, 17}, { 31, 27}, WWT_COLOURBTN, WindowColour::Secondary, SPR_TAB, STR_SHOW_RIDES_STALLS_ON_MAP_TIP ), + MakeWidget ({ 3, 46}, {239, 180}, WWT_SCROLL, WindowColour::Secondary, SCROLL_BOTH ), + MakeSpinnerWidgets({104, 229}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary, STR_MAP_SIZE_VALUE ), // NB: 3 widgets + MakeWidget ({ 4, 1}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_BUY_LAND_RIGHTS, STR_SELECT_PARK_OWNED_LAND_TIP ), + MakeWidget ({ 4, 1}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PARK_ENTRANCE, STR_BUILD_PARK_ENTRANCE_TIP ), + MakeWidget ({ 28, 1}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SET_STARTING_POSITIONS_TIP ), + MakeWidget ({ 4, 17}, { 44, 32}, WWT_IMGBTN, WindowColour::Secondary, SPR_LAND_TOOL_SIZE_0 ), + MakeRemapWidget ({ 5, 18}, { 16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), + MakeRemapWidget ({ 31, 32}, { 16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), + MakeWidget ({ 58, 197}, {184, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_LAND_OWNED, STR_SET_LAND_TO_BE_OWNED_TIP ), + MakeWidget ({ 58, 197}, {184, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_CONSTRUCTION_RIGHTS_OWNED, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_OWNED_TIP ), + MakeWidget ({ 58, 197}, {184, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_LAND_SALE, STR_SET_LAND_TO_BE_AVAILABLE_TIP ), + MakeWidget ({ 58, 197}, {174, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_CONSTRUCTION_RIGHTS_SALE, STR_SET_CONSTRUCTION_RIGHTS_TO_BE_AVAILABLE_TIP), + MakeWidget ({218, 45}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 ), + MakeWidget ({110, 189}, {131, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MAPGEN_WINDOW_TITLE, STR_MAP_GENERATOR_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index 24cec8157b..4eb8945d9b 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -116,58 +116,58 @@ 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 */ + MakeWidget({ 0, 43}, {WW, 229}, WWT_RESIZE, WindowColour::Secondary), /* 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, - MakeWidget ({155, 255}, {90, 14}, WWT_BUTTON, 1, STR_MAPGEN_ACTION_GENERATE ), - MakeSpinnerWidgets({104, 52}, {95, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({104, 70}, {95, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeSpinnerWidgets({104, 88}, {95, 12}, WWT_SPINNER, 1 ), // NB: 3 widgets - MakeWidget ({104, 106}, {47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ), - MakeWidget ({151, 106}, {47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), + MakeWidget ({155, 255}, {90, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MAPGEN_ACTION_GENERATE ), + MakeSpinnerWidgets({104, 52}, {95, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({104, 70}, {95, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeSpinnerWidgets({104, 88}, {95, 12}, WWT_SPINNER, WindowColour::Secondary ), // NB: 3 widgets + MakeWidget ({104, 106}, {47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ), + MakeWidget ({151, 106}, {47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), { WIDGETS_END }, }; static rct_widget RandomWidgets[] = { SHARED_WIDGETS, - MakeWidget({155, 255}, { 90, 14}, WWT_BUTTON, 1, STR_MAPGEN_ACTION_GENERATE ), - MakeWidget({ 4, 52}, {195, 12}, WWT_CHECKBOX, 1, STR_MAPGEN_OPTION_RANDOM_TERRAIN), - MakeWidget({ 4, 70}, {195, 12}, WWT_CHECKBOX, 1, STR_MAPGEN_OPTION_PLACE_TREES ), + MakeWidget({155, 255}, { 90, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MAPGEN_ACTION_GENERATE ), + MakeWidget({ 4, 52}, {195, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MAPGEN_OPTION_RANDOM_TERRAIN), + MakeWidget({ 4, 70}, {195, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MAPGEN_OPTION_PLACE_TREES ), { WIDGETS_END }, }; static rct_widget SimplexWidgets[] = { SHARED_WIDGETS, - MakeWidget ({155, 255}, { 90, 14}, WWT_BUTTON, 1, STR_MAPGEN_ACTION_GENERATE ), // WIDX_SIMPLEX_GENERATE - MakeWidget ({ 4, 52}, {195, 12}, WWT_LABEL_CENTRED, 1, STR_MAPGEN_SIMPLEX_NOISE ), // WIDX_SIMPLEX_LABEL - MakeSpinnerWidgets({104, 70}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_SIMPLEX_LOW{,_UP,_DOWN} - MakeSpinnerWidgets({104, 88}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_SIMPLEX_HIGH{,_UP,_DOWN} - MakeSpinnerWidgets({104, 106}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_SIMPLEX_BASE_FREQ{,_UP,_DOWN} - MakeSpinnerWidgets({104, 124}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_SIMPLEX_OCTAVES{,_UP,_DOWN} - MakeSpinnerWidgets({104, 148}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_SIMPLEX_MAP_SIZE{,_UP,_DOWN} - MakeSpinnerWidgets({104, 166}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_SIMPLEX_WATER_LEVEL{,_UP,_DOWN} - MakeWidget ({104, 190}, { 95, 12}, WWT_CHECKBOX, 1, STR_MAPGEN_OPTION_RANDOM_TERRAIN ), // WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX - MakeWidget ({102, 202}, { 47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ), // WIDX_SIMPLEX_FLOOR_TEXTURE - MakeWidget ({150, 202}, { 47, 36}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), // WIDX_SIMPLEX_WALL_TEXTURE - MakeWidget ({104, 239}, { 95, 12}, WWT_CHECKBOX, 1 ), // WIDX_SIMPLEX_PLACE_TREES_CHECKBOX + MakeWidget ({155, 255}, { 90, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MAPGEN_ACTION_GENERATE ), // WIDX_SIMPLEX_GENERATE + MakeWidget ({ 4, 52}, {195, 12}, WWT_LABEL_CENTRED, WindowColour::Secondary, STR_MAPGEN_SIMPLEX_NOISE ), // WIDX_SIMPLEX_LABEL + MakeSpinnerWidgets({104, 70}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_SIMPLEX_LOW{,_UP,_DOWN} + MakeSpinnerWidgets({104, 88}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_SIMPLEX_HIGH{,_UP,_DOWN} + MakeSpinnerWidgets({104, 106}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_SIMPLEX_BASE_FREQ{,_UP,_DOWN} + MakeSpinnerWidgets({104, 124}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_SIMPLEX_OCTAVES{,_UP,_DOWN} + MakeSpinnerWidgets({104, 148}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_SIMPLEX_MAP_SIZE{,_UP,_DOWN} + MakeSpinnerWidgets({104, 166}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_SIMPLEX_WATER_LEVEL{,_UP,_DOWN} + MakeWidget ({104, 190}, { 95, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MAPGEN_OPTION_RANDOM_TERRAIN ), // WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX + MakeWidget ({102, 202}, { 47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP ), // WIDX_SIMPLEX_FLOOR_TEXTURE + MakeWidget ({150, 202}, { 47, 36}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP), // WIDX_SIMPLEX_WALL_TEXTURE + MakeWidget ({104, 239}, { 95, 12}, WWT_CHECKBOX, WindowColour::Secondary ), // WIDX_SIMPLEX_PLACE_TREES_CHECKBOX { WIDGETS_END }, }; static rct_widget HeightmapWidgets[] = { SHARED_WIDGETS, - MakeWidget ({ 95, 255}, {150, 14}, WWT_BUTTON, 1, STR_MAPGEN_SELECT_HEIGHTMAP), // WIDX_HEIGHTMAP_SELECT - MakeWidget ({ 4, 52}, {100, 12}, WWT_CHECKBOX, 1, STR_MAPGEN_SMOOTH_HEIGHTMAP), // WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP - MakeSpinnerWidgets({104, 70}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_HEIGHTMAP_STRENGTH{,_UP,_DOWN} - MakeWidget ({ 4, 88}, {100, 12}, WWT_CHECKBOX, 1, STR_MAPGEN_NORMALIZE ), // WIDX_HEIGHTMAP_NORMALIZE - MakeWidget ({ 4, 106}, {100, 12}, WWT_CHECKBOX, 1, STR_MAPGEN_SMOOTH_TILE ), // WIDX_HEIGHTMAP_SMOOTH_TILES - MakeSpinnerWidgets({104, 124}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN} - MakeSpinnerWidgets({104, 142}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN} - MakeSpinnerWidgets({104, 160}, { 95, 12}, WWT_SPINNER, 1 ), // WIDX_HEIGHTMAP_WATER_LEVEL{,_UP,_DOWN} + MakeWidget ({ 95, 255}, {150, 14}, WWT_BUTTON, WindowColour::Secondary, STR_MAPGEN_SELECT_HEIGHTMAP), // WIDX_HEIGHTMAP_SELECT + MakeWidget ({ 4, 52}, {100, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MAPGEN_SMOOTH_HEIGHTMAP), // WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP + MakeSpinnerWidgets({104, 70}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_HEIGHTMAP_STRENGTH{,_UP,_DOWN} + MakeWidget ({ 4, 88}, {100, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MAPGEN_NORMALIZE ), // WIDX_HEIGHTMAP_NORMALIZE + MakeWidget ({ 4, 106}, {100, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MAPGEN_SMOOTH_TILE ), // WIDX_HEIGHTMAP_SMOOTH_TILES + MakeSpinnerWidgets({104, 124}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN} + MakeSpinnerWidgets({104, 142}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN} + MakeSpinnerWidgets({104, 160}, { 95, 12}, WWT_SPINNER, WindowColour::Secondary ), // WIDX_HEIGHTMAP_WATER_LEVEL{,_UP,_DOWN} { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp index 666869165c..2be36ff532 100644 --- a/src/openrct2-ui/windows/MapTooltip.cpp +++ b/src/openrct2-ui/windows/MapTooltip.cpp @@ -18,7 +18,7 @@ // clang-format off static rct_widget window_map_tooltip_widgets[] = { - MakeWidget({0, 0}, {200, 30}, WWT_IMGBTN, 0), + MakeWidget({0, 0}, {200, 30}, WWT_IMGBTN, WindowColour::Primary), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 65b31f0a69..362b92cd9d 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -48,36 +48,36 @@ enum { static rct_widget window_maze_construction_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 3, 17}, {160, 55}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_MODE ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({35, 29}, { 32, 32}, WWT_FLATBTN, 1, SPR_MAZE_CONSTRUCTION_BUILD, STR_RIDE_CONSTRUCTION_BUILD_MODE ), - MakeWidget({67, 29}, { 32, 32}, WWT_FLATBTN, 1, SPR_MAZE_CONSTRUCTION_MOVE, STR_RIDE_CONSTRUCTION_MOVE_MODE ), - MakeWidget({99, 29}, { 32, 32}, WWT_FLATBTN, 1, SPR_MAZE_CONSTRUCTION_FILL_IN, STR_RIDE_CONSTRUCTION_FILL_IN_MODE ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 3, 80}, {160, 87}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_BUILD ), - MakeWidget({83, 96}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_NE, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - MakeWidget({83, 125}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_SE, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - MakeWidget({38, 125}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_SW, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - MakeWidget({38, 96}, { 45, 29}, WWT_FLATBTN, 1, SPR_CONSTRUCTION_DIRECTION_NW, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), - MakeWidget({ 3, 168}, {160, 28}, WWT_GROUPBOX, 0 ), - MakeWidget({ 9, 178}, { 70, 12}, WWT_BUTTON, 1, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), - MakeWidget({87, 178}, { 70, 12}, WWT_BUTTON, 1, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0 ), + MakeWidget({ 3, 17}, {160, 55}, WWT_GROUPBOX, WindowColour::Primary , STR_RIDE_CONSTRUCTION_MODE ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({35, 29}, { 32, 32}, WWT_FLATBTN, WindowColour::Secondary, SPR_MAZE_CONSTRUCTION_BUILD, STR_RIDE_CONSTRUCTION_BUILD_MODE ), + MakeWidget({67, 29}, { 32, 32}, WWT_FLATBTN, WindowColour::Secondary, SPR_MAZE_CONSTRUCTION_MOVE, STR_RIDE_CONSTRUCTION_MOVE_MODE ), + MakeWidget({99, 29}, { 32, 32}, WWT_FLATBTN, WindowColour::Secondary, SPR_MAZE_CONSTRUCTION_FILL_IN, STR_RIDE_CONSTRUCTION_FILL_IN_MODE ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 3, 80}, {160, 87}, WWT_GROUPBOX, WindowColour::Primary , STR_RIDE_CONSTRUCTION_BUILD ), + MakeWidget({83, 96}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_NE, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + MakeWidget({83, 125}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_SE, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + MakeWidget({38, 125}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_SW, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + MakeWidget({38, 96}, { 45, 29}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION_DIRECTION_NW, STR_RIDE_CONSTRUCTION_BUILD_MAZE_IN_THIS_DIRECTION_TIP), + MakeWidget({ 3, 168}, {160, 28}, WWT_GROUPBOX, WindowColour::Primary ), + MakeWidget({ 9, 178}, { 70, 12}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), + MakeWidget({87, 178}, { 70, 12}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary ), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 3d9d6920c3..5873dced29 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 */ \ - 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 */ + MakeWidget({ 0, 0}, {340, 240}, WWT_FRAME, WindowColour::Primary ), /* panel / background */ \ + MakeWidget({ 1, 1}, {338, 14}, WWT_CAPTION, WindowColour::Primary, STR_NONE, STR_WINDOW_TITLE_TIP ), /* title bar */ \ + MakeWidget({327, 2}, { 11, 12}, WWT_CLOSEBOX, WindowColour::Primary, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), /* close x button */ \ + MakeWidget({ 0, 43}, {340, 197}, WWT_RESIZE, WindowColour::Secondary ), /* 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, @@ -74,32 +74,32 @@ static rct_widget window_multiplayer_information_widgets[] = { static rct_widget window_multiplayer_players_widgets[] = { MAIN_MULTIPLAYER_WIDGETS, - MakeWidget({ 3, 46}, {173, 15}, WWT_TABLE_HEADER, 0, STR_PLAYER ), // Player name - MakeWidget({176, 46}, { 83, 15}, WWT_TABLE_HEADER, 0, STR_GROUP ), // Player name - MakeWidget({259, 46}, {100, 15}, WWT_TABLE_HEADER, 0, STR_LAST_ACTION), // Player name - MakeWidget({359, 46}, { 42, 15}, WWT_TABLE_HEADER, 0, STR_PING ), // Player name - MakeWidget({ 3, 60}, {334, 177}, WWT_SCROLL, 1, SCROLL_VERTICAL), // list + MakeWidget({ 3, 46}, {173, 15}, WWT_TABLE_HEADER, WindowColour::Primary , STR_PLAYER ), // Player name + MakeWidget({176, 46}, { 83, 15}, WWT_TABLE_HEADER, WindowColour::Primary , STR_GROUP ), // Player name + MakeWidget({259, 46}, {100, 15}, WWT_TABLE_HEADER, WindowColour::Primary , STR_LAST_ACTION), // Player name + MakeWidget({359, 46}, { 42, 15}, WWT_TABLE_HEADER, WindowColour::Primary , STR_PING ), // Player name + MakeWidget({ 3, 60}, {334, 177}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL), // list { WIDGETS_END } }; static rct_widget window_multiplayer_groups_widgets[] = { MAIN_MULTIPLAYER_WIDGETS, - MakeWidget({141, 46}, {175, 12}, WWT_DROPDOWN, 1 ), // default group - MakeWidget({305, 47}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH), - MakeWidget({ 11, 65}, { 92, 12}, WWT_BUTTON, 1, STR_ADD_GROUP ), // add group button - MakeWidget({113, 65}, { 92, 12}, WWT_BUTTON, 1, STR_REMOVE_GROUP ), // remove group button - MakeWidget({215, 65}, { 92, 12}, WWT_BUTTON, 1, STR_RENAME_GROUP ), // rename group button - MakeWidget({ 72, 80}, {175, 12}, WWT_DROPDOWN, 1 ), // selected group - MakeWidget({236, 81}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH), - MakeWidget({ 3, 94}, {314, 207}, WWT_SCROLL, 1, SCROLL_VERTICAL ), // permissions list + MakeWidget({141, 46}, {175, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // default group + MakeWidget({305, 47}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH), + MakeWidget({ 11, 65}, { 92, 12}, WWT_BUTTON, WindowColour::Secondary, STR_ADD_GROUP ), // add group button + MakeWidget({113, 65}, { 92, 12}, WWT_BUTTON, WindowColour::Secondary, STR_REMOVE_GROUP ), // remove group button + MakeWidget({215, 65}, { 92, 12}, WWT_BUTTON, WindowColour::Secondary, STR_RENAME_GROUP ), // rename group button + MakeWidget({ 72, 80}, {175, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // selected group + MakeWidget({236, 81}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH), + MakeWidget({ 3, 94}, {314, 207}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL ), // permissions list { WIDGETS_END } }; static rct_widget window_multiplayer_options_widgets[] = { MAIN_MULTIPLAYER_WIDGETS, - MakeWidget({3, 50}, {295, 12}, WWT_CHECKBOX, 1, STR_LOG_CHAT, STR_LOG_CHAT_TIP ), - MakeWidget({3, 64}, {295, 12}, WWT_CHECKBOX, 1, STR_LOG_SERVER_ACTIONS, STR_LOG_SERVER_ACTIONS_TIP ), - MakeWidget({3, 78}, {295, 12}, WWT_CHECKBOX, 1, STR_ALLOW_KNOWN_KEYS_ONLY, STR_ALLOW_KNOWN_KEYS_ONLY_TIP), + MakeWidget({3, 50}, {295, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_LOG_CHAT, STR_LOG_CHAT_TIP ), + MakeWidget({3, 64}, {295, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_LOG_SERVER_ACTIONS, STR_LOG_SERVER_ACTIONS_TIP ), + MakeWidget({3, 78}, {295, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_ALLOW_KNOWN_KEYS_ONLY, STR_ALLOW_KNOWN_KEYS_ONLY_TIP), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/MusicCredits.cpp b/src/openrct2-ui/windows/MusicCredits.cpp index f2ff9d267d..4404887900 100644 --- a/src/openrct2-ui/windows/MusicCredits.cpp +++ b/src/openrct2-ui/windows/MusicCredits.cpp @@ -27,7 +27,7 @@ enum WINDOW_MUSIC_CREDITS_WIDGET_IDX { static rct_widget window_music_credits_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({4, 18}, {502, 292}, WWT_SCROLL, 0, SCROLL_VERTICAL), // scroll + MakeWidget({4, 18}, {502, 292}, WWT_SCROLL, WindowColour::Primary, SCROLL_VERTICAL), // scroll { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Network.cpp b/src/openrct2-ui/windows/Network.cpp index 1151de82ab..62c51ab230 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 - MakeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP ), // tab + MakeWidget({ 0, 43}, {450, 167}, WWT_RESIZE, WindowColour::Secondary), // content panel + MakeTab ({ 3, 17}, STR_SHOW_SERVER_INFO_TIP ), // tab { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index e905918f8f..c30bb03da5 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -25,9 +25,9 @@ enum WINDOW_NETWORK_STATUS_WIDGET_IDX { }; static rct_widget window_network_status_widgets[] = { - 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 + MakeWidget({ 0, 0}, {441, 91}, WWT_FRAME, WindowColour::Primary ), // panel / background + MakeWidget({ 1, 1}, {438, 14}, WWT_CAPTION, WindowColour::Primary, STR_NONE, STR_WINDOW_TITLE_TIP), // title bar + MakeWidget({427, 2}, { 11, 12}, WWT_CLOSEBOX, WindowColour::Primary, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), // close x button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp index 9d7db05f43..21570b43c3 100644 --- a/src/openrct2-ui/windows/NewCampaign.cpp +++ b/src/openrct2-ui/windows/NewCampaign.cpp @@ -42,12 +42,12 @@ enum WINDOW_NEW_CAMPAIGN_WIDGET_IDX { static rct_widget window_new_campaign_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 14, 24}, {126, 12}, WWT_LABEL, 0, STR_EMPTY ), // ride label - MakeWidget ({100, 24}, {242, 12}, WWT_DROPDOWN, 0, STR_EMPTY ), // ride dropdown - MakeWidget ({330, 25}, { 11, 10}, WWT_BUTTON, 0, STR_DROPDOWN_GLYPH ), // ride dropdown button - MakeWidget ({ 14, 41}, {126, 14}, WWT_LABEL, 0, STR_LENGTH_OF_TIME ), // weeks label - MakeSpinnerWidgets({120, 41}, {100, 14}, WWT_SPINNER, 0, STR_EMPTY ), // weeks (3 widgets) - MakeWidget ({ 14, 89}, {322, 14}, WWT_BUTTON, 0, STR_MARKETING_START_THIS_MARKETING_CAMPAIGN), // start button + MakeWidget ({ 14, 24}, {126, 12}, WWT_LABEL, WindowColour::Primary, STR_EMPTY ), // ride label + MakeWidget ({100, 24}, {242, 12}, WWT_DROPDOWN, WindowColour::Primary, STR_EMPTY ), // ride dropdown + MakeWidget ({330, 25}, { 11, 10}, WWT_BUTTON, WindowColour::Primary, STR_DROPDOWN_GLYPH ), // ride dropdown button + MakeWidget ({ 14, 41}, {126, 14}, WWT_LABEL, WindowColour::Primary, STR_LENGTH_OF_TIME ), // weeks label + MakeSpinnerWidgets({120, 41}, {100, 14}, WWT_SPINNER, WindowColour::Primary, STR_EMPTY ), // weeks (3 widgets) + MakeWidget ({ 14, 89}, {322, 14}, WWT_BUTTON, WindowColour::Primary, STR_MARKETING_START_THIS_MARKETING_CAMPAIGN), // start button { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 55cf8591ac..2206913773 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, WindowColour::Secondary ), + 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, WindowColour::Secondary, SCROLL_VERTICAL ), + MakeWidget({ 3, 47}, {290, 70}, WWT_GROUPBOX, WindowColour::Tertiary , STR_CURRENTLY_IN_DEVELOPMENT ), + MakeWidget({ 3, 124}, {290, 65}, WWT_GROUPBOX, WindowColour::Tertiary , STR_LAST_DEVELOPMENT ), + MakeWidget({265, 161}, { 24, 24}, WWT_FLATBTN, WindowColour::Tertiary , 0xFFFFFFFF, STR_RESEARCH_SHOW_DETAILS_TIP ), + MakeWidget({265, 68}, { 24, 24}, WWT_FLATBTN, WindowColour::Tertiary , SPR_FINANCE, STR_FINANCES_RESEARCH_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index e3dfdcee71..dfacdbc098 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -34,8 +34,8 @@ enum WINDOW_NEWS_WIDGET_IDX { static rct_widget window_news_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({372, 18}, { 24, 24}, WWT_FLATBTN, 0, SPR_TAB_GEARS_0), // settings - MakeWidget({ 4, 44}, {392, 252}, WWT_SCROLL, 0, SCROLL_VERTICAL), // scroll + MakeWidget({372, 18}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary, SPR_TAB_GEARS_0), // settings + MakeWidget({ 4, 44}, {392, 252}, WWT_SCROLL, WindowColour::Primary, SCROLL_VERTICAL), // scroll { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/NewsOptions.cpp b/src/openrct2-ui/windows/NewsOptions.cpp index 9cefa65205..f54227d23c 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 - 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), + MakeWidget({ 0, 43}, {400, 257}, WWT_RESIZE, WindowColour::Secondary), // 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, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), + MakeWidget({ 0, 0}, {343, 14}, WWT_CHECKBOX, WindowColour::Tertiary ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index baf8803d77..3b4394381b 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -270,14 +270,14 @@ constexpr int32_t TYPE_COL_LEFT = 5 * WW_LESS_PADDING / 8 + 1; static rct_widget window_object_load_error_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ NAME_COL_LEFT, 57}, {108, 14}, WWT_TABLE_HEADER, 0, STR_OBJECT_NAME ), // 'Object name' header - MakeWidget({SOURCE_COL_LEFT, 57}, {166, 14}, WWT_TABLE_HEADER, 0, STR_OBJECT_SOURCE ), // 'Object source' header - MakeWidget({ TYPE_COL_LEFT, 57}, {166, 14}, WWT_TABLE_HEADER, 0, STR_OBJECT_TYPE ), // 'Object type' header - MakeWidget({ NAME_COL_LEFT, 70}, {442, 298}, WWT_SCROLL, 0, SCROLL_VERTICAL ), // Scrollable list area - MakeWidget({ NAME_COL_LEFT, 377}, {145, 14}, WWT_BUTTON, 0, STR_COPY_SELECTED, STR_COPY_SELECTED_TIP), // Copy selected button - MakeWidget({ 152, 377}, {145, 14}, WWT_BUTTON, 0, STR_COPY_ALL, STR_COPY_ALL_TIP ), // Copy all button + MakeWidget({ NAME_COL_LEFT, 57}, {108, 14}, WWT_TABLE_HEADER, WindowColour::Primary, STR_OBJECT_NAME ), // 'Object name' header + MakeWidget({SOURCE_COL_LEFT, 57}, {166, 14}, WWT_TABLE_HEADER, WindowColour::Primary, STR_OBJECT_SOURCE ), // 'Object source' header + MakeWidget({ TYPE_COL_LEFT, 57}, {166, 14}, WWT_TABLE_HEADER, WindowColour::Primary, STR_OBJECT_TYPE ), // 'Object type' header + MakeWidget({ NAME_COL_LEFT, 70}, {442, 298}, WWT_SCROLL, WindowColour::Primary, SCROLL_VERTICAL ), // Scrollable list area + MakeWidget({ NAME_COL_LEFT, 377}, {145, 14}, WWT_BUTTON, WindowColour::Primary, STR_COPY_SELECTED, STR_COPY_SELECTED_TIP), // Copy selected button + MakeWidget({ 152, 377}, {145, 14}, WWT_BUTTON, WindowColour::Primary, STR_COPY_ALL, STR_COPY_ALL_TIP ), // Copy all button #ifndef DISABLE_HTTP - MakeWidget({ 300, 377}, {146, 14}, WWT_BUTTON, 0, STR_DOWNLOAD_ALL, STR_DOWNLOAD_ALL_TIP ), // Download all button + MakeWidget({ 300, 377}, {146, 14}, WWT_BUTTON, WindowColour::Primary, STR_DOWNLOAD_ALL, STR_DOWNLOAD_ALL_TIP ), // Download all button #endif { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index d59af82fde..6de718fa34 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -194,118 +194,118 @@ 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 ), \ - 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 ) + MakeWidget({ 0, 43}, {WW, 289}, WWT_RESIZE, WindowColour::Secondary), \ + 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, - MakeWidget ({ 5, 53}, {300, 155}, WWT_GROUPBOX, 1, STR_HARDWARE_GROUP ), // Hardware group - MakeWidget ({155, 68}, {145, 12}, WWT_DROPDOWN, 1 ), // Fullscreen - MakeWidget ({288, 69}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_FULLSCREEN_MODE_TIP ), - MakeWidget ({155, 83}, {145, 12}, WWT_DROPDOWN, 1, STR_ARG_16_RESOLUTION_X_BY_Y ), // Resolution - MakeWidget ({288, 84}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_DISPLAY_RESOLUTION_TIP ), - MakeSpinnerWidgets({155, 98}, {145, 12}, WWT_SPINNER, 1, STR_NONE, STR_WINDOW_SCALE_TIP ), // Scale spinner (3 widgets) - MakeWidget ({155, 113}, {145, 12}, WWT_DROPDOWN, 1 ), - MakeWidget ({288, 114}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_DRAWING_ENGINE_TIP ), - MakeWidget ({155, 128}, {145, 12}, WWT_DROPDOWN, 1 ), // Scaling quality hint - MakeWidget ({288, 129}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SCALE_QUALITY_TIP ), - MakeWidget ({ 25, 144}, {266, 12}, WWT_CHECKBOX, 1, STR_STEAM_OVERLAY_PAUSE, STR_STEAM_OVERLAY_PAUSE_TIP ), // Pause on steam overlay - MakeWidget ({ 11, 161}, {143, 12}, WWT_CHECKBOX, 1, STR_UNCAP_FPS, STR_UNCAP_FPS_TIP ), // Uncap fps - MakeWidget ({155, 161}, {136, 12}, WWT_CHECKBOX, 1, STR_SHOW_FPS, STR_SHOW_FPS_TIP ), // Show fps - MakeWidget ({155, 176}, {136, 12}, WWT_CHECKBOX, 1, STR_MULTITHREADING, STR_MULTITHREADING_TIP ), // Multithreading - MakeWidget ({ 11, 176}, {143, 12}, WWT_CHECKBOX, 1, STR_USE_VSYNC, STR_USE_VSYNC_TIP ), // Use vsync - MakeWidget ({ 11, 191}, {280, 12}, WWT_CHECKBOX, 1, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS_TIP), // Minimise fullscreen focus loss + MakeWidget ({ 5, 53}, {300, 155}, WWT_GROUPBOX, WindowColour::Secondary, STR_HARDWARE_GROUP ), // Hardware group + MakeWidget ({155, 68}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Fullscreen + MakeWidget ({288, 69}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_FULLSCREEN_MODE_TIP ), + MakeWidget ({155, 83}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_ARG_16_RESOLUTION_X_BY_Y ), // Resolution + MakeWidget ({288, 84}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_DISPLAY_RESOLUTION_TIP ), + MakeSpinnerWidgets({155, 98}, {145, 12}, WWT_SPINNER, WindowColour::Secondary, STR_NONE, STR_WINDOW_SCALE_TIP ), // Scale spinner (3 widgets) + MakeWidget ({155, 113}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary ), + MakeWidget ({288, 114}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_DRAWING_ENGINE_TIP ), + MakeWidget ({155, 128}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Scaling quality hint + MakeWidget ({288, 129}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SCALE_QUALITY_TIP ), + MakeWidget ({ 25, 144}, {266, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_STEAM_OVERLAY_PAUSE, STR_STEAM_OVERLAY_PAUSE_TIP ), // Pause on steam overlay + MakeWidget ({ 11, 161}, {143, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_UNCAP_FPS, STR_UNCAP_FPS_TIP ), // Uncap fps + MakeWidget ({155, 161}, {136, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_SHOW_FPS, STR_SHOW_FPS_TIP ), // Show fps + MakeWidget ({155, 176}, {136, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MULTITHREADING, STR_MULTITHREADING_TIP ), // Multithreading + MakeWidget ({ 11, 176}, {143, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_USE_VSYNC, STR_USE_VSYNC_TIP ), // Use vsync + MakeWidget ({ 11, 191}, {280, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS, STR_MINIMISE_FULLSCREEN_ON_FOCUS_LOSS_TIP), // Minimise fullscreen focus loss { WIDGETS_END }, }; static rct_widget window_options_rendering_widgets[] = { MAIN_OPTIONS_WIDGETS, #define FRAME_RENDERING_START 53 - MakeWidget({ 5, FRAME_RENDERING_START + 0}, {300, 108}, WWT_GROUPBOX, 1, STR_RENDERING_GROUP ), // Rendering group - MakeWidget({ 10, FRAME_RENDERING_START + 15}, {281, 12}, WWT_CHECKBOX, 1, STR_TILE_SMOOTHING, STR_TILE_SMOOTHING_TIP ), // Landscape smoothing - MakeWidget({ 10, FRAME_RENDERING_START + 30}, {281, 12}, WWT_CHECKBOX, 1, STR_GRIDLINES, STR_GRIDLINES_TIP ), // Gridlines - MakeWidget({ 10, FRAME_RENDERING_START + 45}, {281, 12}, WWT_CHECKBOX, 1, STR_UPPERCASE_BANNERS, STR_UPPERCASE_BANNERS_TIP ), // Uppercase banners - MakeWidget({ 10, FRAME_RENDERING_START + 60}, {281, 12}, WWT_CHECKBOX, 1, STR_SHOW_GUEST_PURCHASES, STR_SHOW_GUEST_PURCHASES_TIP ), // Guest purchases - MakeWidget({ 10, FRAME_RENDERING_START + 75}, {281, 12}, WWT_CHECKBOX, 1, STR_TRANSPARENT_SCREENSHOT, STR_TRANSPARENT_SCREENSHOT_TIP), // Transparent screenshot - MakeWidget({ 10, FRAME_RENDERING_START + 90}, {281, 12}, WWT_LABEL, 1, STR_VIRTUAL_FLOOR_STYLE ), // Virtual floor - MakeWidget({155, FRAME_RENDERING_START + 90}, {145, 12}, WWT_DROPDOWN, 1, STR_NONE, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown - MakeWidget({288, FRAME_RENDERING_START + 91}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown + MakeWidget({ 5, FRAME_RENDERING_START + 0}, {300, 108}, WWT_GROUPBOX, WindowColour::Secondary, STR_RENDERING_GROUP ), // Rendering group + MakeWidget({ 10, FRAME_RENDERING_START + 15}, {281, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_TILE_SMOOTHING, STR_TILE_SMOOTHING_TIP ), // Landscape smoothing + MakeWidget({ 10, FRAME_RENDERING_START + 30}, {281, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_GRIDLINES, STR_GRIDLINES_TIP ), // Gridlines + MakeWidget({ 10, FRAME_RENDERING_START + 45}, {281, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_UPPERCASE_BANNERS, STR_UPPERCASE_BANNERS_TIP ), // Uppercase banners + MakeWidget({ 10, FRAME_RENDERING_START + 60}, {281, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_SHOW_GUEST_PURCHASES, STR_SHOW_GUEST_PURCHASES_TIP ), // Guest purchases + MakeWidget({ 10, FRAME_RENDERING_START + 75}, {281, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_TRANSPARENT_SCREENSHOT, STR_TRANSPARENT_SCREENSHOT_TIP), // Transparent screenshot + MakeWidget({ 10, FRAME_RENDERING_START + 90}, {281, 12}, WWT_LABEL, WindowColour::Secondary, STR_VIRTUAL_FLOOR_STYLE ), // Virtual floor + MakeWidget({155, FRAME_RENDERING_START + 90}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_NONE, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown + MakeWidget({288, FRAME_RENDERING_START + 91}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_VIRTUAL_FLOOR_STYLE_TIP ), // Virtual floor dropdown #undef FRAME_RENDERING_START #define FRAME_EFFECTS_START 163 - MakeWidget({ 5, FRAME_EFFECTS_START + 0}, {300, 94}, WWT_GROUPBOX, 1, STR_EFFECTS_GROUP ), // Rendering group - MakeWidget({10, FRAME_EFFECTS_START + 15}, {281, 12}, WWT_CHECKBOX, 1, STR_CYCLE_DAY_NIGHT, STR_CYCLE_DAY_NIGHT_TIP ), // Cycle day-night - MakeWidget({25, FRAME_EFFECTS_START + 30}, {266, 12}, WWT_CHECKBOX, 1, STR_ENABLE_LIGHTING_EFFECTS, STR_ENABLE_LIGHTING_EFFECTS_TIP ), // Enable light fx - MakeWidget({40, FRAME_EFFECTS_START + 45}, {251, 12}, WWT_CHECKBOX, 1, STR_ENABLE_LIGHTING_VEHICLES, STR_ENABLE_LIGHTING_VEHICLES_TIP), // Enable light fx for vehicles - MakeWidget({10, FRAME_EFFECTS_START + 60}, {281, 12}, WWT_CHECKBOX, 1, STR_RENDER_WEATHER_EFFECTS, STR_RENDER_WEATHER_EFFECTS_TIP ), // Render weather effects - MakeWidget({25, FRAME_EFFECTS_START + 75}, {266, 12}, WWT_CHECKBOX, 1, STR_DISABLE_LIGHTNING_EFFECT, STR_DISABLE_LIGHTNING_EFFECT_TIP), // Disable lightning effect + MakeWidget({ 5, FRAME_EFFECTS_START + 0}, {300, 94}, WWT_GROUPBOX, WindowColour::Secondary, STR_EFFECTS_GROUP ), // Rendering group + MakeWidget({10, FRAME_EFFECTS_START + 15}, {281, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_CYCLE_DAY_NIGHT, STR_CYCLE_DAY_NIGHT_TIP ), // Cycle day-night + MakeWidget({25, FRAME_EFFECTS_START + 30}, {266, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_ENABLE_LIGHTING_EFFECTS, STR_ENABLE_LIGHTING_EFFECTS_TIP ), // Enable light fx + MakeWidget({40, FRAME_EFFECTS_START + 45}, {251, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_ENABLE_LIGHTING_VEHICLES, STR_ENABLE_LIGHTING_VEHICLES_TIP), // Enable light fx for vehicles + MakeWidget({10, FRAME_EFFECTS_START + 60}, {281, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_RENDER_WEATHER_EFFECTS, STR_RENDER_WEATHER_EFFECTS_TIP ), // Render weather effects + MakeWidget({25, FRAME_EFFECTS_START + 75}, {266, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_DISABLE_LIGHTNING_EFFECT, STR_DISABLE_LIGHTNING_EFFECT_TIP), // Disable lightning effect #undef FRAME_EFFECTS_START { WIDGETS_END }, }; static rct_widget window_options_culture_widgets[] = { MAIN_OPTIONS_WIDGETS, - MakeWidget({155, 53}, {145, 12}, WWT_DROPDOWN, 1, STR_STRING ), // language - MakeWidget({288, 54}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_LANGUAGE_TIP ), - MakeWidget({155, 68}, {145, 12}, WWT_DROPDOWN, 1 ), // Currency - MakeWidget({288, 69}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_CURRENCY_TIP ), - MakeWidget({155, 83}, {145, 12}, WWT_DROPDOWN, 1 ), // Distance and speed - MakeWidget({288, 84}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_DISTANCE_AND_SPEED_TIP ), - MakeWidget({155, 98}, {145, 13}, WWT_DROPDOWN, 1 ), // Temperature - MakeWidget({288, 99}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_TEMPERATURE_FORMAT_TIP ), - MakeWidget({155, 113}, {145, 12}, WWT_DROPDOWN, 1 ), // Height labels - MakeWidget({288, 114}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_HEIGHT_LABELS_UNITS_TIP), - MakeWidget({155, 128}, {145, 12}, WWT_DROPDOWN, 1 ), // Date format - MakeWidget({288, 129}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_DATE_FORMAT_TIP ), + MakeWidget({155, 53}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_STRING ), // language + MakeWidget({288, 54}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_LANGUAGE_TIP ), + MakeWidget({155, 68}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Currency + MakeWidget({288, 69}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_CURRENCY_TIP ), + MakeWidget({155, 83}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Distance and speed + MakeWidget({288, 84}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_DISTANCE_AND_SPEED_TIP ), + MakeWidget({155, 98}, {145, 13}, WWT_DROPDOWN, WindowColour::Secondary ), // Temperature + MakeWidget({288, 99}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_TEMPERATURE_FORMAT_TIP ), + MakeWidget({155, 113}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Height labels + MakeWidget({288, 114}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_HEIGHT_LABELS_UNITS_TIP), + MakeWidget({155, 128}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Date format + MakeWidget({288, 129}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_DATE_FORMAT_TIP ), { WIDGETS_END }, }; static rct_widget window_options_audio_widgets[] = { MAIN_OPTIONS_WIDGETS, - MakeWidget({ 10, 53}, {290, 12}, WWT_DROPDOWN, 1 ), // Audio device - MakeWidget({288, 54}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_AUDIO_DEVICE_TIP ), - MakeWidget({ 10, 69}, {220, 12}, WWT_CHECKBOX, 1, STR_MASTER_VOLUME, STR_MASTER_VOLUME_TIP), // Enable / disable master sound - MakeWidget({ 10, 84}, {220, 12}, WWT_CHECKBOX, 1, STR_SOUND_EFFECTS, STR_SOUND_EFFECTS_TIP), // Enable / disable sound effects - MakeWidget({ 10, 99}, {220, 12}, WWT_CHECKBOX, 1, STR_RIDE_MUSIC, STR_RIDE_MUSIC_TIP ), // Enable / disable ride music - MakeWidget({ 10, 113}, {290, 13}, WWT_CHECKBOX, 1, STR_AUDIO_FOCUS, STR_AUDIO_FOCUS_TIP ), // Enable / disable audio disabled on focus lost - MakeWidget({ 10, 128}, {145, 13}, WWT_LABEL, 1, STR_OPTIONS_MUSIC_LABEL ), // Title music label - MakeWidget({155, 127}, {145, 13}, WWT_DROPDOWN, 1 ), // Title music - MakeWidget({288, 128}, { 11, 11}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_TITLE_MUSIC_TIP ), - MakeWidget({155, 68}, {145, 13}, WWT_SCROLL, 1, SCROLL_HORIZONTAL ), // Master volume - MakeWidget({155, 83}, {145, 13}, WWT_SCROLL, 1, SCROLL_HORIZONTAL ), // Sound effect volume - MakeWidget({155, 98}, {145, 13}, WWT_SCROLL, 1, SCROLL_HORIZONTAL ), // Music volume + MakeWidget({ 10, 53}, {290, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Audio device + MakeWidget({288, 54}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_AUDIO_DEVICE_TIP ), + MakeWidget({ 10, 69}, {220, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MASTER_VOLUME, STR_MASTER_VOLUME_TIP), // Enable / disable master sound + MakeWidget({ 10, 84}, {220, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_SOUND_EFFECTS, STR_SOUND_EFFECTS_TIP), // Enable / disable sound effects + MakeWidget({ 10, 99}, {220, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_RIDE_MUSIC, STR_RIDE_MUSIC_TIP ), // Enable / disable ride music + MakeWidget({ 10, 113}, {290, 13}, WWT_CHECKBOX, WindowColour::Secondary, STR_AUDIO_FOCUS, STR_AUDIO_FOCUS_TIP ), // Enable / disable audio disabled on focus lost + MakeWidget({ 10, 128}, {145, 13}, WWT_LABEL, WindowColour::Secondary, STR_OPTIONS_MUSIC_LABEL ), // Title music label + MakeWidget({155, 127}, {145, 13}, WWT_DROPDOWN, WindowColour::Secondary ), // Title music + MakeWidget({288, 128}, { 11, 11}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_TITLE_MUSIC_TIP ), + MakeWidget({155, 68}, {145, 13}, WWT_SCROLL, WindowColour::Secondary, SCROLL_HORIZONTAL ), // Master volume + MakeWidget({155, 83}, {145, 13}, WWT_SCROLL, WindowColour::Secondary, SCROLL_HORIZONTAL ), // Sound effect volume + MakeWidget({155, 98}, {145, 13}, WWT_SCROLL, WindowColour::Secondary, SCROLL_HORIZONTAL ), // Music volume { WIDGETS_END }, }; static rct_widget window_options_controls_and_interface_widgets[] = { MAIN_OPTIONS_WIDGETS, #define CONTROLS_GROUP_START 53 - MakeWidget({ 5, CONTROLS_GROUP_START + 0}, {300, 92}, WWT_GROUPBOX, 1, STR_CONTROLS_GROUP ), // Controls group - MakeWidget({ 10, CONTROLS_GROUP_START + 13}, {290, 14}, WWT_CHECKBOX, 2, STR_SCREEN_EDGE_SCROLLING, STR_SCREEN_EDGE_SCROLLING_TIP ), // Edge scrolling - MakeWidget({ 10, CONTROLS_GROUP_START + 30}, {290, 12}, WWT_CHECKBOX, 2, STR_TRAP_MOUSE, STR_TRAP_MOUSE_TIP ), // Trap mouse - MakeWidget({ 10, CONTROLS_GROUP_START + 45}, {290, 12}, WWT_CHECKBOX, 2, STR_INVERT_RIGHT_MOUSE_DRAG, STR_INVERT_RIGHT_MOUSE_DRAG_TIP), // Invert right mouse dragging - MakeWidget({ 10, CONTROLS_GROUP_START + 60}, {290, 12}, WWT_CHECKBOX, 2, STR_ZOOM_TO_CURSOR, STR_ZOOM_TO_CURSOR_TIP ), // Zoom to cursor - MakeWidget({155, CONTROLS_GROUP_START + 75}, {145, 13}, WWT_BUTTON, 1, STR_HOTKEY, STR_HOTKEY_TIP ), // Set hotkeys buttons + MakeWidget({ 5, CONTROLS_GROUP_START + 0}, {300, 92}, WWT_GROUPBOX, WindowColour::Secondary, STR_CONTROLS_GROUP ), // Controls group + MakeWidget({ 10, CONTROLS_GROUP_START + 13}, {290, 14}, WWT_CHECKBOX, WindowColour::Tertiary , STR_SCREEN_EDGE_SCROLLING, STR_SCREEN_EDGE_SCROLLING_TIP ), // Edge scrolling + MakeWidget({ 10, CONTROLS_GROUP_START + 30}, {290, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_TRAP_MOUSE, STR_TRAP_MOUSE_TIP ), // Trap mouse + MakeWidget({ 10, CONTROLS_GROUP_START + 45}, {290, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_INVERT_RIGHT_MOUSE_DRAG, STR_INVERT_RIGHT_MOUSE_DRAG_TIP), // Invert right mouse dragging + MakeWidget({ 10, CONTROLS_GROUP_START + 60}, {290, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_ZOOM_TO_CURSOR, STR_ZOOM_TO_CURSOR_TIP ), // Zoom to cursor + MakeWidget({155, CONTROLS_GROUP_START + 75}, {145, 13}, WWT_BUTTON, WindowColour::Secondary, STR_HOTKEY, STR_HOTKEY_TIP ), // Set hotkeys buttons #undef CONTROLS_GROUP_START #define THEMES_GROUP_START 148 - MakeWidget({ 5, THEMES_GROUP_START + 0}, {300, 48}, WWT_GROUPBOX, 1, STR_THEMES_GROUP ), // Toolbar buttons group - MakeWidget({155, THEMES_GROUP_START + 14}, {145, 12}, WWT_DROPDOWN, 1, STR_STRING ), // Themes - MakeWidget({288, THEMES_GROUP_START + 15}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_CURRENT_THEME_TIP ), - MakeWidget({155, THEMES_GROUP_START + 30}, {145, 13}, WWT_BUTTON, 1, STR_EDIT_THEMES_BUTTON, STR_EDIT_THEMES_BUTTON_TIP), // Themes button + MakeWidget({ 5, THEMES_GROUP_START + 0}, {300, 48}, WWT_GROUPBOX, WindowColour::Secondary, STR_THEMES_GROUP ), // Toolbar buttons group + MakeWidget({155, THEMES_GROUP_START + 14}, {145, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_STRING ), // Themes + MakeWidget({288, THEMES_GROUP_START + 15}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_CURRENT_THEME_TIP ), + MakeWidget({155, THEMES_GROUP_START + 30}, {145, 13}, WWT_BUTTON, WindowColour::Secondary, STR_EDIT_THEMES_BUTTON, STR_EDIT_THEMES_BUTTON_TIP), // Themes button #undef THEMES_GROUP_START #define TOOLBAR_GROUP_START 200 - MakeWidget({ 5, TOOLBAR_GROUP_START + 0}, {300, 76}, WWT_GROUPBOX, 1, STR_TOOLBAR_BUTTONS_GROUP ), // Toolbar buttons group - MakeWidget({ 24, TOOLBAR_GROUP_START + 31}, {122, 12}, WWT_CHECKBOX, 2, STR_FINANCES_BUTTON_ON_TOOLBAR, STR_FINANCES_BUTTON_ON_TOOLBAR_TIP ), // Finances - MakeWidget({ 24, TOOLBAR_GROUP_START + 46}, {122, 12}, WWT_CHECKBOX, 2, STR_RESEARCH_BUTTON_ON_TOOLBAR, STR_RESEARCH_BUTTON_ON_TOOLBAR_TIP ), // Research - MakeWidget({155, TOOLBAR_GROUP_START + 31}, {145, 12}, WWT_CHECKBOX, 2, STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP ), // Cheats - MakeWidget({155, TOOLBAR_GROUP_START + 46}, {145, 12}, WWT_CHECKBOX, 2, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP), // Recent messages - MakeWidget({ 24, TOOLBAR_GROUP_START + 61}, {162, 12}, WWT_CHECKBOX, 2, STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP ), // Mute - MakeWidget({155, TOOLBAR_GROUP_START + 61}, {145, 12}, WWT_CHECKBOX, 2, STR_CHAT_BUTTON_ON_TOOLBAR, STR_CHAT_BUTTON_ON_TOOLBAR_TIP ), // Chat + MakeWidget({ 5, TOOLBAR_GROUP_START + 0}, {300, 76}, WWT_GROUPBOX, WindowColour::Secondary, STR_TOOLBAR_BUTTONS_GROUP ), // Toolbar buttons group + MakeWidget({ 24, TOOLBAR_GROUP_START + 31}, {122, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_FINANCES_BUTTON_ON_TOOLBAR, STR_FINANCES_BUTTON_ON_TOOLBAR_TIP ), // Finances + MakeWidget({ 24, TOOLBAR_GROUP_START + 46}, {122, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_RESEARCH_BUTTON_ON_TOOLBAR, STR_RESEARCH_BUTTON_ON_TOOLBAR_TIP ), // Research + MakeWidget({155, TOOLBAR_GROUP_START + 31}, {145, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_CHEATS_BUTTON_ON_TOOLBAR, STR_CHEATS_BUTTON_ON_TOOLBAR_TIP ), // Cheats + MakeWidget({155, TOOLBAR_GROUP_START + 46}, {145, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR_TIP), // Recent messages + MakeWidget({ 24, TOOLBAR_GROUP_START + 61}, {162, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_MUTE_BUTTON_ON_TOOLBAR, STR_MUTE_BUTTON_ON_TOOLBAR_TIP ), // Mute + MakeWidget({155, TOOLBAR_GROUP_START + 61}, {145, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_CHAT_BUTTON_ON_TOOLBAR, STR_CHAT_BUTTON_ON_TOOLBAR_TIP ), // Chat { WIDGETS_END }, #undef TOOLBAR_GROUP_START }; @@ -313,46 +313,46 @@ static rct_widget window_options_controls_and_interface_widgets[] = { static rct_widget window_options_misc_widgets[] = { MAIN_OPTIONS_WIDGETS, #define TITLE_SEQUENCE_START 53 - MakeWidget({ 5, TITLE_SEQUENCE_START + 0}, {300, 65}, WWT_GROUPBOX, 1, STR_OPTIONS_TITLE_SEQUENCE ), - MakeWidget({ 10, TITLE_SEQUENCE_START + 15}, {290, 16}, WWT_CHECKBOX, 2, STR_OPTIONS_RANDOM_TITLE_SEQUENCE ), // Random Title Sequence - MakeWidget({135, TITLE_SEQUENCE_START + 32}, {165, 12}, WWT_DROPDOWN, 1, STR_STRING ), // Title sequence dropdown - MakeWidget({288, TITLE_SEQUENCE_START + 33}, { 11, 12}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_TITLE_SEQUENCE_TIP ), // Title sequence dropdown button - MakeWidget({135, TITLE_SEQUENCE_START + 48}, {165, 13}, WWT_BUTTON, 1, STR_EDIT_TITLE_SEQUENCES_BUTTON, STR_EDIT_TITLE_SEQUENCES_BUTTON_TIP), // Edit title sequences button + MakeWidget({ 5, TITLE_SEQUENCE_START + 0}, {300, 65}, WWT_GROUPBOX, WindowColour::Secondary, STR_OPTIONS_TITLE_SEQUENCE ), + MakeWidget({ 10, TITLE_SEQUENCE_START + 15}, {290, 16}, WWT_CHECKBOX, WindowColour::Tertiary , STR_OPTIONS_RANDOM_TITLE_SEQUENCE ), // Random Title Sequence + MakeWidget({135, TITLE_SEQUENCE_START + 32}, {165, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_STRING ), // Title sequence dropdown + MakeWidget({288, TITLE_SEQUENCE_START + 33}, { 11, 12}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_TITLE_SEQUENCE_TIP ), // Title sequence dropdown button + MakeWidget({135, TITLE_SEQUENCE_START + 48}, {165, 13}, WWT_BUTTON, WindowColour::Secondary, STR_EDIT_TITLE_SEQUENCES_BUTTON, STR_EDIT_TITLE_SEQUENCES_BUTTON_TIP), // Edit title sequences button #undef TITLE_SEQUENCE_START #define SCENARIO_START 122 - MakeWidget({ 5, SCENARIO_START + 0}, {300, 51}, WWT_GROUPBOX, 1, STR_OPTIONS_SCENARIO_SELECTION ), - MakeWidget({175, SCENARIO_START + 15}, {125, 12}, WWT_DROPDOWN, 1 ), // Scenario select mode - MakeWidget({288, SCENARIO_START + 16}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SCENARIO_GROUPING_TIP ), - MakeWidget({ 25, SCENARIO_START + 30}, {275, 16}, WWT_CHECKBOX, 2, STR_OPTIONS_SCENARIO_UNLOCKING, STR_SCENARIO_UNLOCKING_TIP), // Unlocking of scenarios + MakeWidget({ 5, SCENARIO_START + 0}, {300, 51}, WWT_GROUPBOX, WindowColour::Secondary, STR_OPTIONS_SCENARIO_SELECTION ), + MakeWidget({175, SCENARIO_START + 15}, {125, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Scenario select mode + MakeWidget({288, SCENARIO_START + 16}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SCENARIO_GROUPING_TIP ), + MakeWidget({ 25, SCENARIO_START + 30}, {275, 16}, WWT_CHECKBOX, WindowColour::Tertiary , STR_OPTIONS_SCENARIO_UNLOCKING, STR_SCENARIO_UNLOCKING_TIP), // Unlocking of scenarios #undef SCENARIO_START #define SCENARIO_OPTIONS_START 177 - MakeWidget({ 5, SCENARIO_OPTIONS_START + 0}, {300, 35}, WWT_GROUPBOX, 1, STR_SCENARIO_OPTIONS ), - MakeWidget({10, SCENARIO_OPTIONS_START + 15}, {290, 15}, WWT_CHECKBOX, 2, STR_ALLOW_EARLY_COMPLETION, STR_EARLY_COMPLETION_TIP), // Allow early scenario completion + MakeWidget({ 5, SCENARIO_OPTIONS_START + 0}, {300, 35}, WWT_GROUPBOX, WindowColour::Secondary, STR_SCENARIO_OPTIONS ), + MakeWidget({10, SCENARIO_OPTIONS_START + 15}, {290, 15}, WWT_CHECKBOX, WindowColour::Tertiary , STR_ALLOW_EARLY_COMPLETION, STR_EARLY_COMPLETION_TIP), // Allow early scenario completion #undef SCENARIO_OPTIONS_START #define TWEAKS_START 216 - MakeWidget({ 5, TWEAKS_START + 0}, {300, 81}, WWT_GROUPBOX, 1, STR_OPTIONS_TWEAKS ), - MakeWidget({ 10, TWEAKS_START + 15}, {290, 15}, WWT_CHECKBOX, 2, STR_REAL_NAME, STR_REAL_NAME_TIP ), // Show 'real' names of guests - MakeWidget({ 10, TWEAKS_START + 30}, {290, 15}, WWT_CHECKBOX, 2, STR_AUTO_STAFF_PLACEMENT, STR_AUTO_STAFF_PLACEMENT_TIP ), // Auto staff placement - MakeWidget({ 10, TWEAKS_START + 45}, {290, 15}, WWT_CHECKBOX, 2, STR_AUTO_OPEN_SHOPS, STR_AUTO_OPEN_SHOPS_TIP ), // Automatically open shops & stalls - MakeWidget({175, TWEAKS_START + 61}, {125, 12}, WWT_DROPDOWN, 1 ), // Default inspection time dropdown - MakeWidget({288, TWEAKS_START + 62}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_DEFAULT_INSPECTION_INTERVAL_TIP), // Default inspection time dropdown button + MakeWidget({ 5, TWEAKS_START + 0}, {300, 81}, WWT_GROUPBOX, WindowColour::Secondary, STR_OPTIONS_TWEAKS ), + MakeWidget({ 10, TWEAKS_START + 15}, {290, 15}, WWT_CHECKBOX, WindowColour::Tertiary , STR_REAL_NAME, STR_REAL_NAME_TIP ), // Show 'real' names of guests + MakeWidget({ 10, TWEAKS_START + 30}, {290, 15}, WWT_CHECKBOX, WindowColour::Tertiary , STR_AUTO_STAFF_PLACEMENT, STR_AUTO_STAFF_PLACEMENT_TIP ), // Auto staff placement + MakeWidget({ 10, TWEAKS_START + 45}, {290, 15}, WWT_CHECKBOX, WindowColour::Tertiary , STR_AUTO_OPEN_SHOPS, STR_AUTO_OPEN_SHOPS_TIP ), // Automatically open shops & stalls + MakeWidget({175, TWEAKS_START + 61}, {125, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Default inspection time dropdown + MakeWidget({288, TWEAKS_START + 62}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_DEFAULT_INSPECTION_INTERVAL_TIP), // Default inspection time dropdown button #undef TWEAKS_START { WIDGETS_END }, }; static rct_widget window_options_advanced_widgets[] = { MAIN_OPTIONS_WIDGETS, - MakeWidget ({ 10, 54}, {290, 12}, WWT_CHECKBOX, 2, STR_ENABLE_DEBUGGING_TOOLS, STR_ENABLE_DEBUGGING_TOOLS_TIP ), // Enable debugging tools - MakeWidget ({ 10, 69}, {290, 12}, WWT_CHECKBOX, 2, STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM_TIP), // Allow loading with incorrect checksum - MakeWidget ({ 10, 84}, {290, 12}, WWT_CHECKBOX, 2, STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP ), // Export plug-in objects with saved games - MakeWidget ({ 10, 99}, {290, 12}, WWT_CHECKBOX, 2, STR_STAY_CONNECTED_AFTER_DESYNC, STR_STAY_CONNECTED_AFTER_DESYNC_TIP ), // Do not disconnect after the client desynchronises with the server - MakeWidget ({ 10, 114}, {290, 12}, WWT_CHECKBOX, 1, STR_ALWAYS_NATIVE_LOADSAVE, STR_ALWAYS_NATIVE_LOADSAVE_TIP ), // Use native load/save window - MakeWidget ({165, 130}, {135, 13}, WWT_DROPDOWN, 1 ), // Autosave dropdown - MakeWidget ({288, 131}, { 11, 11}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_AUTOSAVE_FREQUENCY_TIP ), // Autosave dropdown button - MakeSpinnerWidgets({165, 150}, {135, 12}, WWT_SPINNER, 1, STR_NONE, STR_AUTOSAVE_AMOUNT_TIP ), // Autosave amount spinner - MakeWidget ({ 23, 169}, {276, 12}, WWT_LABEL, 1, STR_PATH_TO_RCT1, STR_PATH_TO_RCT1_TIP ), // RCT 1 path text - MakeWidget ({ 24, 184}, {266, 14}, WWT_BUTTON, 1, STR_NONE, STR_STRING_TOOLTIP ), // RCT 1 path button - MakeWidget ({289, 184}, { 11, 14}, WWT_BUTTON, 1, STR_CLOSE_X, STR_PATH_TO_RCT1_CLEAR_TIP ), // RCT 1 path clear button + MakeWidget ({ 10, 54}, {290, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_ENABLE_DEBUGGING_TOOLS, STR_ENABLE_DEBUGGING_TOOLS_TIP ), // Enable debugging tools + MakeWidget ({ 10, 69}, {290, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM, STR_ALLOW_LOADING_WITH_INCORRECT_CHECKSUM_TIP), // Allow loading with incorrect checksum + MakeWidget ({ 10, 84}, {290, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP ), // Export plug-in objects with saved games + MakeWidget ({ 10, 99}, {290, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_STAY_CONNECTED_AFTER_DESYNC, STR_STAY_CONNECTED_AFTER_DESYNC_TIP ), // Do not disconnect after the client desynchronises with the server + MakeWidget ({ 10, 114}, {290, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_ALWAYS_NATIVE_LOADSAVE, STR_ALWAYS_NATIVE_LOADSAVE_TIP ), // Use native load/save window + MakeWidget ({165, 130}, {135, 13}, WWT_DROPDOWN, WindowColour::Secondary ), // Autosave dropdown + MakeWidget ({288, 131}, { 11, 11}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_AUTOSAVE_FREQUENCY_TIP ), // Autosave dropdown button + MakeSpinnerWidgets({165, 150}, {135, 12}, WWT_SPINNER, WindowColour::Secondary, STR_NONE, STR_AUTOSAVE_AMOUNT_TIP ), // Autosave amount spinner + MakeWidget ({ 23, 169}, {276, 12}, WWT_LABEL, WindowColour::Secondary, STR_PATH_TO_RCT1, STR_PATH_TO_RCT1_TIP ), // RCT 1 path text + MakeWidget ({ 24, 184}, {266, 14}, WWT_BUTTON, WindowColour::Secondary, STR_NONE, STR_STRING_TOOLTIP ), // RCT 1 path button + MakeWidget ({289, 184}, { 11, 14}, WWT_BUTTON, WindowColour::Secondary, STR_CLOSE_X, STR_PATH_TO_RCT1_CLEAR_TIP ), // RCT 1 path clear button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp index 03ad9d2178..e55f46d4a6 100644 --- a/src/openrct2-ui/windows/Park.cpp +++ b/src/openrct2-ui/windows/Park.cpp @@ -80,25 +80,25 @@ 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 */ \ - 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 */ + MakeWidget({ 0, 43}, {WW, 131}, WWT_RESIZE, WindowColour::Secondary), /* 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), - MakeWidget({ 3, 46}, {202, 115}, WWT_VIEWPORT, 1 ), // viewport - MakeWidget({ 3, 161}, {202, 11}, WWT_LABEL_CENTRED, 1 ), // status - MakeWidget({205, 49}, { 24, 24}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_OPEN_OR_CLOSE_PARK_TIP ), // open / close - MakeWidget({205, 73}, { 24, 24}, WWT_FLATBTN, 1, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_AND_CONSTRUCTION_RIGHTS_TIP), // buy land rights - MakeWidget({205, 97}, { 24, 24}, WWT_FLATBTN, 1, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // locate - MakeWidget({205, 121}, { 24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_NAME_PARK_TIP ), // rename - MakeWidget({210, 51}, { 14, 15}, WWT_IMGBTN, 1, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_PARK_TIP ), - MakeWidget({210, 66}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_PARK_TIP ), + MakeWidget({ 3, 46}, {202, 115}, WWT_VIEWPORT, WindowColour::Secondary ), // viewport + MakeWidget({ 3, 161}, {202, 11}, WWT_LABEL_CENTRED, WindowColour::Secondary ), // status + MakeWidget({205, 49}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_OPEN_OR_CLOSE_PARK_TIP ), // open / close + MakeWidget({205, 73}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_BUY_LAND_RIGHTS, STR_BUY_LAND_AND_CONSTRUCTION_RIGHTS_TIP), // buy land rights + MakeWidget({205, 97}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), // locate + MakeWidget({205, 121}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RENAME, STR_NAME_PARK_TIP ), // rename + MakeWidget({210, 51}, { 14, 15}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_PARK_TIP ), + MakeWidget({210, 66}, { 14, 14}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_PARK_TIP ), { WIDGETS_END }, }; @@ -114,8 +114,8 @@ static rct_widget window_park_guests_widgets[] = { static rct_widget window_park_price_widgets[] = { MAIN_PARK_WIDGETS(230), - MakeWidget ({ 21, 50}, {126, 14}, WWT_LABEL, 1, STR_ADMISSION_PRICE), - MakeSpinnerWidgets({147, 50}, { 76, 14}, WWT_SPINNER, 1 ), // Price (3 widgets) + MakeWidget ({ 21, 50}, {126, 14}, WWT_LABEL, WindowColour::Secondary, STR_ADMISSION_PRICE), + MakeSpinnerWidgets({147, 50}, { 76, 14}, WWT_SPINNER, WindowColour::Secondary ), // Price (3 widgets) { WIDGETS_END }, }; @@ -126,7 +126,7 @@ static rct_widget window_park_stats_widgets[] = { static rct_widget window_park_objective_widgets[] = { MAIN_PARK_WIDGETS(230), - MakeWidget({7, 207}, {216, 14}, WWT_BUTTON, 1, STR_ENTER_NAME_INTO_SCENARIO_CHART), // enter name + MakeWidget({7, 207}, {216, 14}, WWT_BUTTON, WindowColour::Secondary, STR_ENTER_NAME_INTO_SCENARIO_CHART), // enter name { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index d5b4b7fbd7..217dd005a3 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -48,20 +48,20 @@ 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 */ \ - MakeTab ({ 3, 17} ), /* Tab 1 */ \ - MakeTab ({ 34, 17} ) /* Tab 2 */ + MakeWidget({ 0, 0}, {192, 157}, WWT_FRAME, WindowColour::Primary ), /* Panel / Background */ \ + MakeWidget({ 1, 1}, {190, 14}, WWT_CAPTION, WindowColour::Primary , STR_STRING, STR_WINDOW_TITLE_TIP), /* Title */ \ + MakeWidget({179, 2}, { 11, 12}, WWT_CLOSEBOX, WindowColour::Primary , STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), /* Close x button */ \ + MakeWidget({ 0, 43}, {192, 114}, WWT_RESIZE, WindowColour::Secondary ), /* Resize */ \ + MakeTab ({ 3, 17} ), /* Tab 1 */ \ + MakeTab ({ 34, 17} ) /* Tab 2 */ static rct_widget window_player_overview_widgets[] = { WINDOW_PLAYER_COMMON_WIDGETS, - 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 + MakeWidget({ 3, 46}, {175, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Permission group + MakeWidget({167, 47}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), + MakeWidget({179, 45}, { 12, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_PLAYER_TIP), // Locate button + MakeWidget({179, 69}, { 12, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH, STR_KICK_PLAYER_TIP ), // Kick button + MakeWidget({ 3, 60}, {175, 61}, WWT_VIEWPORT, WindowColour::Secondary ), // Viewport { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp index 10dd4f34d0..6e05c42e44 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 ), - 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 ), + MakeWidget({ 0, 43}, { WW_DEVELOPMENT, 153}, WWT_RESIZE, WindowColour::Secondary ), + MakeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP), + MakeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), + MakeWidget({ 3, 47}, {WW_DEVELOPMENT - 10, 70}, WWT_GROUPBOX, WindowColour::Tertiary , STR_CURRENTLY_IN_DEVELOPMENT ), + MakeWidget({ 3, 124}, {WW_DEVELOPMENT - 10, 65}, WWT_GROUPBOX, WindowColour::Tertiary , STR_LAST_DEVELOPMENT ), + MakeWidget({265, 161}, { 24, 24}, WWT_FLATBTN, WindowColour::Tertiary , 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 ), - 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 ), + MakeWidget({ 0, 43}, { WW_FUNDING, 164}, WWT_RESIZE, WindowColour::Secondary ), + MakeTab ({ 3, 17}, STR_RESEARCH_AND_DEVELOPMENT_TIP ), + MakeTab ({ 34, 17}, STR_FINANCES_RESEARCH_TIP ), + MakeWidget({ 3, 47}, { WW_FUNDING - 6, 45}, WWT_GROUPBOX, WindowColour::Tertiary , STR_RESEARCH_FUNDING_ ), + MakeWidget({ 8, 59}, { 160, 14}, WWT_DROPDOWN, WindowColour::Tertiary , 0xFFFFFFFF, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + MakeWidget({156, 60}, { 11, 12}, WWT_BUTTON, WindowColour::Tertiary , STR_DROPDOWN_GLYPH, STR_SELECT_LEVEL_OF_RESEARCH_AND_DEVELOPMENT), + MakeWidget({ 3, 96}, { WW_FUNDING - 6, 107}, WWT_GROUPBOX, WindowColour::Tertiary , STR_RESEARCH_PRIORITIES ), + MakeWidget({ 8, 108}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES_TIP ), + MakeWidget({ 8, 121}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES_TIP ), + MakeWidget({ 8, 134}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS_TIP ), + MakeWidget({ 8, 147}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_RESEARCH_NEW_THRILL_RIDES, STR_RESEARCH_NEW_THRILL_RIDES_TIP ), + MakeWidget({ 8, 160}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_RESEARCH_NEW_WATER_RIDES, STR_RESEARCH_NEW_WATER_RIDES_TIP ), + MakeWidget({ 8, 173}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, WindowColour::Tertiary , STR_RESEARCH_NEW_SHOPS_AND_STALLS, STR_RESEARCH_NEW_SHOPS_AND_STALLS_TIP ), + MakeWidget({ 8, 186}, {WW_FUNDING - 16, 12}, WWT_CHECKBOX, WindowColour::Tertiary , 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 2992acc6a4..6ee802b9db 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -209,159 +209,159 @@ 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 ), \ - 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 ) + MakeWidget({ 0, 43}, {316, 137}, WWT_RESIZE, WindowColour::Secondary), \ + 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[] = { MAIN_RIDE_WIDGETS, - MakeWidget({ 3, 60}, {288, 107}, WWT_VIEWPORT, 1, STR_VIEWPORT ), - MakeWidget({ 35, 46}, {222, 12}, WWT_DROPDOWN, 1, 0xFFFFFFFF, STR_VIEW_SELECTION ), - MakeWidget({245, 47}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_VIEW_SELECTION ), - MakeWidget({ 3, 167}, {288, 11}, WWT_LABEL_CENTRED, 1 ), - MakeWidget({291, 46}, { 24, 24}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_OPEN_CLOSE_OR_TEST_RIDE), - MakeWidget({291, 70}, { 24, 24}, WWT_FLATBTN, 1, SPR_CONSTRUCTION, STR_CONSTRUCTION ), - MakeWidget({291, 94}, { 24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_NAME_RIDE_TIP ), - MakeWidget({291, 118}, { 24, 24}, WWT_FLATBTN, 1, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), - MakeWidget({291, 142}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_DEMOLISH_RIDE_TIP ), - MakeWidget({296, 48}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_RIDE_TIP ), - MakeWidget({296, 62}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_TEST_BUTTON_0, STR_SIMULATE_RIDE_TIP ), - MakeWidget({296, 62}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_TEST_BUTTON_0, STR_TEST_RIDE_TIP ), - MakeWidget({296, 76}, { 14, 14}, WWT_IMGBTN, 1, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_RIDE_TIP ), - MakeWidget({ 3, 180}, {305, 12}, WWT_DROPDOWN, 1, STR_ARG_6_STRINGID ), - MakeWidget({297, 180}, { 11, 12}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeWidget({ 3, 60}, {288, 107}, WWT_VIEWPORT, WindowColour::Secondary, STR_VIEWPORT ), + MakeWidget({ 35, 46}, {222, 12}, WWT_DROPDOWN, WindowColour::Secondary, 0xFFFFFFFF, STR_VIEW_SELECTION ), + MakeWidget({245, 47}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_VIEW_SELECTION ), + MakeWidget({ 3, 167}, {288, 11}, WWT_LABEL_CENTRED, WindowColour::Secondary ), + MakeWidget({291, 46}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_OPEN_CLOSE_OR_TEST_RIDE), + MakeWidget({291, 70}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION, STR_CONSTRUCTION ), + MakeWidget({291, 94}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RENAME, STR_NAME_RIDE_TIP ), + MakeWidget({291, 118}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP ), + MakeWidget({291, 142}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH, STR_DEMOLISH_RIDE_TIP ), + MakeWidget({296, 48}, { 14, 14}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_CLOSE_BUTTON_0, STR_CLOSE_RIDE_TIP ), + MakeWidget({296, 62}, { 14, 14}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_TEST_BUTTON_0, STR_SIMULATE_RIDE_TIP ), + MakeWidget({296, 62}, { 14, 14}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_TEST_BUTTON_0, STR_TEST_RIDE_TIP ), + MakeWidget({296, 76}, { 14, 14}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_OPEN_BUTTON_0, STR_OPEN_RIDE_TIP ), + MakeWidget({ 3, 180}, {305, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_ARG_6_STRINGID ), + MakeWidget({297, 180}, { 11, 12}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), { WIDGETS_END }, }; // 0x009ADDA8 static rct_widget window_ride_vehicle_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget ({ 7, 50}, {302, 12}, WWT_DROPDOWN, 1 ), - MakeWidget ({297, 51}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - MakeWidget ({ 7, 147}, {302, 43}, WWT_SCROLL, 1, STR_EMPTY ), - MakeSpinnerWidgets({ 7, 196}, {145, 12}, WWT_SPINNER, 1, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP ), - MakeSpinnerWidgets({164, 196}, {145, 12}, WWT_SPINNER, 1, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP), + MakeWidget ({ 7, 50}, {302, 12}, WWT_DROPDOWN, WindowColour::Secondary ), + MakeWidget ({297, 51}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), + MakeWidget ({ 7, 147}, {302, 43}, WWT_SCROLL, WindowColour::Secondary, STR_EMPTY ), + MakeSpinnerWidgets({ 7, 196}, {145, 12}, WWT_SPINNER, WindowColour::Secondary, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP ), + MakeSpinnerWidgets({164, 196}, {145, 12}, WWT_SPINNER, WindowColour::Secondary, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP), { WIDGETS_END }, }; // 0x009ADEFC static rct_widget window_ride_operating_widgets[] = { MAIN_RIDE_WIDGETS, - MakeSpinnerWidgets({157, 61}, {152, 12}, WWT_SPINNER, 1, STR_ARG_18_STRINGID ), // NB: 3 widgets - MakeSpinnerWidgets({157, 75}, {152, 12}, WWT_SPINNER, 1, STR_LIFT_HILL_CHAIN_SPEED_VALUE ), // NB: 3 widgets - MakeWidget ({ 7, 109}, { 80, 12}, WWT_CHECKBOX, 1, STR_WAIT_FOR, STR_WAIT_FOR_PASSENGERS_BEFORE_DEPARTING_TIP), - MakeWidget ({ 7, 124}, {302, 12}, WWT_CHECKBOX, 1 ), - MakeWidget ({ 7, 139}, {150, 12}, WWT_CHECKBOX, 1, STR_MINIMUM_WAITING_TIME, STR_MINIMUM_LENGTH_BEFORE_DEPARTING_TIP ), - MakeSpinnerWidgets({157, 139}, {152, 12}, WWT_SPINNER, 1, STR_ARG_10_STRINGID ), // NB: 3 widgets - MakeWidget ({ 7, 154}, {150, 12}, WWT_CHECKBOX, 1, STR_MAXIMUM_WAITING_TIME, STR_MAXIMUM_LENGTH_BEFORE_DEPARTING_TIP ), - MakeSpinnerWidgets({157, 154}, {152, 12}, WWT_SPINNER, 1, STR_ARG_14_STRINGID ), // NB: 3 widgets - MakeWidget ({ 7, 169}, {302, 12}, WWT_CHECKBOX, 1, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP ), - MakeWidget ({ 21, 61}, {129, 12}, WWT_LABEL, 1 ), - MakeWidget ({ 21, 75}, {129, 12}, WWT_LABEL, 1, STR_LIFT_HILL_CHAIN_SPEED ), - MakeWidget ({ 7, 47}, {302, 12}, WWT_DROPDOWN, 1, 0xFFFFFFFF, STR_SELECT_OPERATING_MODE ), - MakeWidget ({297, 48}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_OPERATING_MODE ), - MakeWidget ({ 87, 109}, {222, 12}, WWT_DROPDOWN, 1 ), - MakeWidget ({297, 110}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - MakeWidget ({ 21, 89}, {129, 12}, WWT_LABEL, 1, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP ), - MakeSpinnerWidgets({157, 89}, {152, 12}, WWT_SPINNER, 1, STR_NUMBER_OF_CIRCUITS_VALUE ), // NB: 3 widgets + MakeSpinnerWidgets({157, 61}, {152, 12}, WWT_SPINNER, WindowColour::Secondary, STR_ARG_18_STRINGID ), // NB: 3 widgets + MakeSpinnerWidgets({157, 75}, {152, 12}, WWT_SPINNER, WindowColour::Secondary, STR_LIFT_HILL_CHAIN_SPEED_VALUE ), // NB: 3 widgets + MakeWidget ({ 7, 109}, { 80, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_WAIT_FOR, STR_WAIT_FOR_PASSENGERS_BEFORE_DEPARTING_TIP), + MakeWidget ({ 7, 124}, {302, 12}, WWT_CHECKBOX, WindowColour::Secondary ), + MakeWidget ({ 7, 139}, {150, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MINIMUM_WAITING_TIME, STR_MINIMUM_LENGTH_BEFORE_DEPARTING_TIP ), + MakeSpinnerWidgets({157, 139}, {152, 12}, WWT_SPINNER, WindowColour::Secondary, STR_ARG_10_STRINGID ), // NB: 3 widgets + MakeWidget ({ 7, 154}, {150, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_MAXIMUM_WAITING_TIME, STR_MAXIMUM_LENGTH_BEFORE_DEPARTING_TIP ), + MakeSpinnerWidgets({157, 154}, {152, 12}, WWT_SPINNER, WindowColour::Secondary, STR_ARG_14_STRINGID ), // NB: 3 widgets + MakeWidget ({ 7, 169}, {302, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP ), + MakeWidget ({ 21, 61}, {129, 12}, WWT_LABEL, WindowColour::Secondary ), + MakeWidget ({ 21, 75}, {129, 12}, WWT_LABEL, WindowColour::Secondary, STR_LIFT_HILL_CHAIN_SPEED ), + MakeWidget ({ 7, 47}, {302, 12}, WWT_DROPDOWN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_OPERATING_MODE ), + MakeWidget ({297, 48}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_OPERATING_MODE ), + MakeWidget ({ 87, 109}, {222, 12}, WWT_DROPDOWN, WindowColour::Secondary ), + MakeWidget ({297, 110}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), + MakeWidget ({ 21, 89}, {129, 12}, WWT_LABEL, WindowColour::Secondary, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP ), + MakeSpinnerWidgets({157, 89}, {152, 12}, WWT_SPINNER, WindowColour::Secondary, STR_NUMBER_OF_CIRCUITS_VALUE ), // NB: 3 widgets { WIDGETS_END }, }; // 0x009AE190 static rct_widget window_ride_maintenance_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget({107, 71}, {202, 12}, WWT_DROPDOWN, 1, STR_EMPTY, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), - MakeWidget({297, 72}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), - MakeWidget({289, 108}, { 24, 24}, WWT_FLATBTN, 1, 0xFFFFFFFF, STR_LOCATE_NEAREST_AVAILABLE_MECHANIC_TIP ), - MakeWidget({265, 108}, { 24, 24}, WWT_FLATBTN, 1, SPR_CONSTRUCTION, STR_REFURBISH_RIDE_TIP ), - MakeWidget({241, 108}, { 24, 24}, WWT_FLATBTN, 1, SPR_NO_ENTRY, STR_DEBUG_FORCE_BREAKDOWN_TIP ), + MakeWidget({107, 71}, {202, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_EMPTY, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), + MakeWidget({297, 72}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_HOW_OFTEN_A_MECHANIC_SHOULD_CHECK_THIS_RIDE), + MakeWidget({289, 108}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_LOCATE_NEAREST_AVAILABLE_MECHANIC_TIP ), + MakeWidget({265, 108}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_CONSTRUCTION, STR_REFURBISH_RIDE_TIP ), + MakeWidget({241, 108}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_NO_ENTRY, STR_DEBUG_FORCE_BREAKDOWN_TIP ), { WIDGETS_END }, }; // 0x009AE2A4 static rct_widget window_ride_colour_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget({ 3, 47}, { 68, 47}, WWT_SPINNER, 1 ), - MakeWidget({ 74, 49}, {239, 12}, WWT_DROPDOWN, 1, STR_ARG_14_STRINGID ), - MakeWidget({301, 50}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_COLOUR_SCHEME_TO_CHANGE_TIP ), - MakeWidget({ 79, 74}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), - MakeWidget({ 99, 74}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), - MakeWidget({119, 74}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP ), - MakeWidget({ 74, 49}, {239, 12}, WWT_DROPDOWN, 1 ), - MakeWidget({301, 50}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - MakeWidget({289, 68}, { 24, 24}, WWT_FLATBTN, 1, SPR_PAINTBRUSH, STR_PAINT_INDIVIDUAL_AREA_TIP ), - MakeWidget({245, 101}, { 68, 47}, WWT_SPINNER, 1 ), - MakeWidget({103, 103}, {139, 12}, WWT_DROPDOWN, 1, STR_EMPTY ), - MakeWidget({230, 104}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP), - MakeWidget({ 3, 157}, { 68, 47}, WWT_SCROLL, 1, STR_EMPTY ), - MakeWidget({ 74, 157}, {239, 12}, WWT_DROPDOWN, 1, STR_ARG_6_STRINGID ), - MakeWidget({301, 158}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP ), - MakeWidget({ 74, 173}, {239, 12}, WWT_DROPDOWN, 1 ), - MakeWidget({301, 174}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_TO_MODIFY_TIP ), - MakeWidget({ 79, 190}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), - MakeWidget({ 99, 190}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), - MakeWidget({119, 190}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP ), + MakeWidget({ 3, 47}, { 68, 47}, WWT_SPINNER, WindowColour::Secondary ), + MakeWidget({ 74, 49}, {239, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_ARG_14_STRINGID ), + MakeWidget({301, 50}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_COLOUR_SCHEME_TO_CHANGE_TIP ), + MakeWidget({ 79, 74}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), + MakeWidget({ 99, 74}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), + MakeWidget({119, 74}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_SUPPORT_STRUCTURE_COLOUR_TIP ), + MakeWidget({ 74, 49}, {239, 12}, WWT_DROPDOWN, WindowColour::Secondary ), + MakeWidget({301, 50}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), + MakeWidget({289, 68}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PAINTBRUSH, STR_PAINT_INDIVIDUAL_AREA_TIP ), + MakeWidget({245, 101}, { 68, 47}, WWT_SPINNER, WindowColour::Secondary ), + MakeWidget({103, 103}, {139, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_EMPTY ), + MakeWidget({230, 104}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP), + MakeWidget({ 3, 157}, { 68, 47}, WWT_SCROLL, WindowColour::Secondary, STR_EMPTY ), + MakeWidget({ 74, 157}, {239, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_ARG_6_STRINGID ), + MakeWidget({301, 158}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_COLOUR_SCHEME_TIP ), + MakeWidget({ 74, 173}, {239, 12}, WWT_DROPDOWN, WindowColour::Secondary ), + MakeWidget({301, 174}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_VEHICLE_TO_MODIFY_TIP ), + MakeWidget({ 79, 190}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP ), + MakeWidget({ 99, 190}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_1_TIP ), + MakeWidget({119, 190}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_ADDITIONAL_COLOUR_2_TIP ), { WIDGETS_END }, }; // 0x009AE4C8 static rct_widget window_ride_music_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget({ 7, 47}, {302, 12}, WWT_CHECKBOX, 1, STR_PLAY_MUSIC, STR_SELECT_MUSIC_TIP ), - MakeWidget({ 7, 62}, {302, 12}, WWT_DROPDOWN, 1, STR_EMPTY ), - MakeWidget({297, 63}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_MUSIC_STYLE_TIP), + MakeWidget({ 7, 47}, {302, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_PLAY_MUSIC, STR_SELECT_MUSIC_TIP ), + MakeWidget({ 7, 62}, {302, 12}, WWT_DROPDOWN, WindowColour::Secondary, STR_EMPTY ), + MakeWidget({297, 63}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_MUSIC_STYLE_TIP), { WIDGETS_END }, }; // 0x009AE5DC static rct_widget window_ride_measurements_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget({288, 194}, { 24, 24}, WWT_FLATBTN, 1, SPR_FLOPPY, STR_SAVE_TRACK_DESIGN), - MakeWidget({ 4, 127}, {154, 14}, WWT_BUTTON, 1, STR_SELECT_NEARBY_SCENERY ), - MakeWidget({158, 127}, {154, 14}, WWT_BUTTON, 1, STR_RESET_SELECTION ), - MakeWidget({ 4, 177}, {154, 14}, WWT_BUTTON, 1, STR_DESIGN_SAVE ), - MakeWidget({158, 177}, {154, 14}, WWT_BUTTON, 1, STR_DESIGN_CANCEL ), + MakeWidget({288, 194}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_FLOPPY, STR_SAVE_TRACK_DESIGN), + MakeWidget({ 4, 127}, {154, 14}, WWT_BUTTON, WindowColour::Secondary, STR_SELECT_NEARBY_SCENERY ), + MakeWidget({158, 127}, {154, 14}, WWT_BUTTON, WindowColour::Secondary, STR_RESET_SELECTION ), + MakeWidget({ 4, 177}, {154, 14}, WWT_BUTTON, WindowColour::Secondary, STR_DESIGN_SAVE ), + MakeWidget({158, 177}, {154, 14}, WWT_BUTTON, WindowColour::Secondary, STR_DESIGN_CANCEL ), { WIDGETS_END }, }; // 0x009AE710 static rct_widget window_ride_graphs_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget({ 3, 46}, {306, 112}, WWT_SCROLL, 1, SCROLL_HORIZONTAL, STR_LOGGING_DATA_FROM_TIP ), - MakeWidget({ 3, 163}, { 73, 14}, WWT_BUTTON, 1, STR_RIDE_STATS_VELOCITY, STR_SHOW_GRAPH_OF_VELOCITY_AGAINST_TIME_TIP ), - MakeWidget({ 76, 163}, { 73, 14}, WWT_BUTTON, 1, STR_RIDE_STATS_ALTITUDE, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP ), - MakeWidget({149, 163}, { 73, 14}, WWT_BUTTON, 1, STR_RIDE_STATS_VERT_G, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP), - MakeWidget({222, 163}, { 73, 14}, WWT_BUTTON, 1, STR_RIDE_STATS_LAT_G, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP ), + MakeWidget({ 3, 46}, {306, 112}, WWT_SCROLL, WindowColour::Secondary, SCROLL_HORIZONTAL, STR_LOGGING_DATA_FROM_TIP ), + MakeWidget({ 3, 163}, { 73, 14}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_STATS_VELOCITY, STR_SHOW_GRAPH_OF_VELOCITY_AGAINST_TIME_TIP ), + MakeWidget({ 76, 163}, { 73, 14}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_STATS_ALTITUDE, STR_SHOW_GRAPH_OF_ALTITUDE_AGAINST_TIME_TIP ), + MakeWidget({149, 163}, { 73, 14}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_STATS_VERT_G, STR_SHOW_GRAPH_OF_VERTICAL_ACCELERATION_AGAINST_TIME_TIP), + MakeWidget({222, 163}, { 73, 14}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_STATS_LAT_G, STR_SHOW_GRAPH_OF_LATERAL_ACCELERATION_AGAINST_TIME_TIP ), { WIDGETS_END }, }; // 0x009AE844 static rct_widget window_ride_income_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget ({ 19, 50}, {126, 14}, WWT_LABEL, 1 ), - MakeSpinnerWidgets({147, 50}, {162, 14}, WWT_SPINNER, 1, STR_ARG_6_CURRENCY2DP ), // NB: 3 widgets - MakeWidget ({ 5, 62}, {306, 13}, WWT_CHECKBOX, 1, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP), - MakeWidget ({ 19, 94}, {126, 14}, WWT_LABEL, 1 ), - MakeSpinnerWidgets({147, 94}, {162, 14}, WWT_SPINNER, 1, STR_RIDE_SECONDARY_PRICE_VALUE ), // NB: 3 widgets - MakeWidget ({ 5, 106}, {306, 13}, WWT_CHECKBOX, 1, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP), + MakeWidget ({ 19, 50}, {126, 14}, WWT_LABEL, WindowColour::Secondary ), + MakeSpinnerWidgets({147, 50}, {162, 14}, WWT_SPINNER, WindowColour::Secondary, STR_ARG_6_CURRENCY2DP ), // NB: 3 widgets + MakeWidget ({ 5, 62}, {306, 13}, WWT_CHECKBOX, WindowColour::Secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP), + MakeWidget ({ 19, 94}, {126, 14}, WWT_LABEL, WindowColour::Secondary ), + MakeSpinnerWidgets({147, 94}, {162, 14}, WWT_SPINNER, WindowColour::Secondary, STR_RIDE_SECONDARY_PRICE_VALUE ), // NB: 3 widgets + MakeWidget ({ 5, 106}, {306, 13}, WWT_CHECKBOX, WindowColour::Secondary, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP), { WIDGETS_END }, }; // 0x009AE9C8 static rct_widget window_ride_customer_widgets[] = { MAIN_RIDE_WIDGETS, - MakeWidget({289, 54}, {24, 24}, WWT_FLATBTN, 1, SPR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION_TIP), - MakeWidget({289, 78}, {24, 24}, WWT_FLATBTN, 1, SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION_TIP ), - MakeWidget({289, 102}, {24, 24}, WWT_FLATBTN, 1, SPR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION_TIP ), + MakeWidget({289, 54}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_THOUGHTS_ABOUT_THIS_RIDE_ATTRACTION_TIP), + MakeWidget({289, 78}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_ON_THIS_RIDE_ATTRACTION_TIP ), + MakeWidget({289, 102}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION, STR_SHOW_GUESTS_QUEUING_FOR_THIS_RIDE_ATTRACTION_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 0237f45b29..e8c35abc36 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -92,41 +92,41 @@ validate_global_widx(WC_RIDE_CONSTRUCTION, WIDX_ROTATE); static rct_widget window_ride_construction_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 3, 17}, {160, 57}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_DIRECTION ), - MakeWidget ({ 3, 76}, {160, 41}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_SLOPE ), - MakeWidget ({ 3, 120}, {160, 41}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_ROLL_BANKING ), - MakeWidget ({ 6, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP ), - MakeWidget ({ 6, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP ), - MakeWidget ({ 28, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP ), - MakeWidget ({ 72, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_STRAIGHT, STR_RIDE_CONSTRUCTION_STRAIGHT_TIP ), - MakeWidget ({116, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP ), - MakeWidget ({138, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP ), - MakeWidget ({138, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP ), - MakeWidget ({ 17, 55}, {132, 14}, WWT_BUTTON, 1, STR_YELLOW_STRING, STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP), - MakeWidget ({ 23, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP ), - MakeWidget ({ 47, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN, STR_RIDE_CONSTRUCTION_SLOPE_DOWN_TIP ), - MakeWidget ({ 71, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL, STR_RIDE_CONSTRUCTION_LEVEL_TIP ), - MakeWidget ({ 95, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_RIDE_CONSTRUCTION_SLOPE_UP_TIP ), - MakeWidget ({119, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP ), - MakeWidget ({134, 88}, { 24, 24}, WWT_FLATBTN, 1, SPR_CHAIN_LIFT, STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP ), - MakeWidget ({ 47, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_LEFT_CURVE_TIP ), - MakeWidget ({ 71, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_NO_BANK, STR_RIDE_CONSTRUCTION_NO_ROLL_TIP ), - MakeWidget ({ 95, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_RIGHT_CURVE_TIP ), - MakeWidget ({ 3, 164}, {160, 170}, WWT_IMGBTN, 1, 0xFFFFFFFF, STR_RIDE_CONSTRUCTION_CONSTRUCT_SELECTED_SECTION_TIP), - MakeWidget ({ 60, 338}, { 46, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH_CURRENT_SECTION, STR_RIDE_CONSTRUCTION_REMOVE_HIGHLIGHTED_SECTION_TIP), - MakeWidget ({ 50, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP ), - MakeWidget ({ 30, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_PREVIOUS, STR_RIDE_CONSTRUCTION_MOVE_TO_PREVIOUS_SECTION_TIP ), - MakeWidget ({112, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_NEXT, STR_RIDE_CONSTRUCTION_MOVE_TO_NEXT_SECTION_TIP ), - MakeWidget ({ 3, 362}, {160, 28}, WWT_GROUPBOX, 0 ), - MakeWidget ({ 9, 372}, { 70, 12}, WWT_BUTTON, 1, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), - MakeWidget ({ 87, 372}, { 70, 12}, WWT_BUTTON, 1, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), - MakeWidget ({ 94, 29}, { 22, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP ), - MakeWidget ({ 72, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), - MakeWidget ({ 19, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_U_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP ), - MakeWidget ({123, 132}, { 24, 24}, WWT_FLATBTN, 1, SPR_RIDE_CONSTRUCTION_O_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP ), - MakeWidget ({ 96, 120}, { 67, 41}, WWT_GROUPBOX, 0, STR_RIDE_CONSTRUCTION_SEAT_ROT ), - MakeSpinnerWidgets({101, 138}, { 58, 12}, WWT_SPINNER, 1, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP), - MakeWidget ({139, 338}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_SIMULATE, STR_SIMULATE_RIDE_TIP ), + MakeWidget ({ 3, 17}, {160, 57}, WWT_GROUPBOX, WindowColour::Primary , STR_RIDE_CONSTRUCTION_DIRECTION ), + MakeWidget ({ 3, 76}, {160, 41}, WWT_GROUPBOX, WindowColour::Primary , STR_RIDE_CONSTRUCTION_SLOPE ), + MakeWidget ({ 3, 120}, {160, 41}, WWT_GROUPBOX, WindowColour::Primary , STR_RIDE_CONSTRUCTION_ROLL_BANKING ), + MakeWidget ({ 6, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_VERY_SMALL_TIP ), + MakeWidget ({ 6, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_LEFT_CURVE_SMALL_TIP ), + MakeWidget ({ 28, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_LEFT_CURVE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_TIP ), + MakeWidget ({ 72, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_STRAIGHT, STR_RIDE_CONSTRUCTION_STRAIGHT_TIP ), + MakeWidget ({116, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_TIP ), + MakeWidget ({138, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL_TIP ), + MakeWidget ({138, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_SMALL, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_VERY_SMALL_TIP ), + MakeWidget ({ 17, 55}, {132, 14}, WWT_BUTTON, WindowColour::Secondary, STR_YELLOW_STRING, STR_RIDE_CONSTRUCTION_OTHER_TRACK_CONFIGURATIONS_TIP), + MakeWidget ({ 23, 88}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_DOWN_TIP ), + MakeWidget ({ 47, 88}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_DOWN, STR_RIDE_CONSTRUCTION_SLOPE_DOWN_TIP ), + MakeWidget ({ 71, 88}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_LEVEL, STR_RIDE_CONSTRUCTION_LEVEL_TIP ), + MakeWidget ({ 95, 88}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_UP, STR_RIDE_CONSTRUCTION_SLOPE_UP_TIP ), + MakeWidget ({119, 88}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_SLOPE_UP_STEEP, STR_RIDE_CONSTRUCTION_STEEP_SLOPE_UP_TIP ), + MakeWidget ({134, 88}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_CHAIN_LIFT, STR_RIDE_CONSTRUCTION_CHAIN_LIFT_TIP ), + MakeWidget ({ 47, 132}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_LEFT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_LEFT_CURVE_TIP ), + MakeWidget ({ 71, 132}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_NO_BANK, STR_RIDE_CONSTRUCTION_NO_ROLL_TIP ), + MakeWidget ({ 95, 132}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_RIGHT_BANK, STR_RIDE_CONSTRUCTION_ROLL_FOR_RIGHT_CURVE_TIP ), + MakeWidget ({ 3, 164}, {160, 170}, WWT_IMGBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_RIDE_CONSTRUCTION_CONSTRUCT_SELECTED_SECTION_TIP), + MakeWidget ({ 60, 338}, { 46, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH_CURRENT_SECTION, STR_RIDE_CONSTRUCTION_REMOVE_HIGHLIGHTED_SECTION_TIP), + MakeWidget ({ 50, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_LEFT_CURVE_LARGE_TIP ), + MakeWidget ({ 30, 338}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PREVIOUS, STR_RIDE_CONSTRUCTION_MOVE_TO_PREVIOUS_SECTION_TIP ), + MakeWidget ({112, 338}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_NEXT, STR_RIDE_CONSTRUCTION_MOVE_TO_NEXT_SECTION_TIP ), + MakeWidget ({ 3, 362}, {160, 28}, WWT_GROUPBOX, WindowColour::Primary ), + MakeWidget ({ 9, 372}, { 70, 12}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_CONSTRUCTION_ENTRANCE, STR_RIDE_CONSTRUCTION_ENTRANCE_TIP ), + MakeWidget ({ 87, 372}, { 70, 12}, WWT_BUTTON, WindowColour::Secondary, STR_RIDE_CONSTRUCTION_EXIT, STR_RIDE_CONSTRUCTION_EXIT_TIP ), + MakeWidget ({ 94, 29}, { 22, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE, STR_RIDE_CONSTRUCTION_RIGHT_CURVE_LARGE_TIP ), + MakeWidget ({ 72, 338}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), + MakeWidget ({ 19, 132}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_U_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP ), + MakeWidget ({123, 132}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RIDE_CONSTRUCTION_O_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP ), + MakeWidget ({ 96, 120}, { 67, 41}, WWT_GROUPBOX, WindowColour::Primary , STR_RIDE_CONSTRUCTION_SEAT_ROT ), + MakeSpinnerWidgets({101, 138}, { 58, 12}, WWT_SPINNER, WindowColour::Secondary, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP), + MakeWidget ({139, 338}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_SIMULATE, STR_SIMULATE_RIDE_TIP ), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index 99b8a67afa..cb8b99ae29 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 - 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 ), + MakeWidget({ 0, 43}, {340, 197}, WWT_RESIZE, WindowColour::Secondary ), // tab page background + MakeWidget({315, 60}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_TOGGLE_OPEN_CLOSE, STR_OPEN_OR_CLOSE_ALL_RIDES ), // open / close all toggle + MakeWidget({150, 46}, {124, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // current information type + MakeWidget({262, 47}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_RIDE_LIST_INFORMATION_TYPE_TIP), // information type dropdown button + MakeWidget({280, 46}, { 54, 12}, WWT_BUTTON, WindowColour::Secondary, 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, WindowColour::Secondary, SCROLL_VERTICAL ), // list + MakeWidget({320, 62}, { 14, 14}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_CLOSE_BUTTON_0 ), + MakeWidget({320, 76}, { 14, 14}, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_RCT1_OPEN_BUTTON_0 ), + MakeWidget({315, 90}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH, STR_QUICK_DEMOLISH_RIDE ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index f8d5edefb1..84ee824868 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -38,10 +38,10 @@ enum WINDOW_SAVE_PROMPT_WIDGET_IDX { static rct_widget window_save_prompt_widgets[] = { WINDOW_SHIM_WHITE(STR_NONE, WW_SAVE, WH_SAVE), - MakeWidget({ 2, 19}, {256, 12}, WWT_LABEL_CENTRED, 0, STR_EMPTY ), // question/label - MakeWidget({ 8, 35}, { 78, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_SAVE ), // save - MakeWidget({ 91, 35}, { 78, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_DONT_SAVE), // don't save - MakeWidget({174, 35}, { 78, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_CANCEL ), // cancel + MakeWidget({ 2, 19}, {256, 12}, WWT_LABEL_CENTRED, WindowColour::Primary, STR_EMPTY ), // question/label + MakeWidget({ 8, 35}, { 78, 14}, WWT_BUTTON, WindowColour::Primary, STR_SAVE_PROMPT_SAVE ), // save + MakeWidget({ 91, 35}, { 78, 14}, WWT_BUTTON, WindowColour::Primary, STR_SAVE_PROMPT_DONT_SAVE), // don't save + MakeWidget({174, 35}, { 78, 14}, WWT_BUTTON, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL ), // cancel { WIDGETS_END }, }; @@ -55,8 +55,8 @@ enum WINDOW_QUIT_PROMPT_WIDGET_IDX { static rct_widget window_quit_prompt_widgets[] = { WINDOW_SHIM_WHITE(STR_QUIT_GAME_PROMPT_TITLE, WW_QUIT, WH_QUIT), - MakeWidget({ 8, 19}, {78, 14}, WWT_BUTTON, 0, STR_OK ), // ok - MakeWidget({91, 19}, {78, 14}, WWT_BUTTON, 0, STR_CANCEL), // cancel + MakeWidget({ 8, 19}, {78, 14}, WWT_BUTTON, WindowColour::Primary, STR_OK ), // ok + MakeWidget({91, 19}, {78, 14}, WWT_BUTTON, WindowColour::Primary, STR_CANCEL), // cancel { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index d476ef5549..7e36e2409b 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -155,35 +155,35 @@ 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 - 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 - MakeWidget ({609, 68}, { 24, 24}, WWT_FLATBTN, 1, SPR_PAINTBRUSH, STR_SCENERY_PAINTBRUSH_TIP ), // 4000000 0x009DE438 - MakeWidget ({615, 93}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_COLOUR ), // 8000000 0x009DE448 - MakeWidget ({615, 105}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR), // 10000000 0x009DE458 - MakeWidget ({615, 117}, { 12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR ), // 20000000 0x009DE468 - MakeWidget ({609, 130}, { 24, 24}, WWT_FLATBTN, 1, SPR_G2_EYEDROPPER, STR_SCENERY_EYEDROPPER_TIP ), // 40000000 0x009DE478 - MakeWidget ({609, 154}, { 24, 24}, WWT_FLATBTN, 1, SPR_SCENERY_CLUSTER, STR_SCENERY_CLUSTER_TIP ), // 40000000 0x009DE478 + MakeWidget ({ 0, 43}, {634, 99}, WWT_RESIZE, WindowColour::Secondary ), // 8 0x009DE2C8 + 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, WindowColour::Secondary, SPR_TAB_QUESTION, STR_STRING_DEFINED_TOOLTIP ), // 800000 0x009DE408 + MakeWidget ({ 2, 47}, {607, 80}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL ), // 1000000 0x009DE418 + MakeWidget ({609, 44}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_ROTATE_ARROW, STR_ROTATE_OBJECTS_90 ), // 2000000 0x009DE428 + MakeWidget ({609, 68}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PAINTBRUSH, STR_SCENERY_PAINTBRUSH_TIP ), // 4000000 0x009DE438 + MakeWidget ({615, 93}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_COLOUR ), // 8000000 0x009DE448 + MakeWidget ({615, 105}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_SECONDARY_COLOUR), // 10000000 0x009DE458 + MakeWidget ({615, 117}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_TERNARY_COLOUR ), // 20000000 0x009DE468 + MakeWidget ({609, 130}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_EYEDROPPER, STR_SCENERY_EYEDROPPER_TIP ), // 40000000 0x009DE478 + MakeWidget ({609, 154}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_SCENERY_CLUSTER, STR_SCENERY_CLUSTER_TIP ), // 40000000 0x009DE478 { WIDGETS_END }, }; // clang-format on diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp index 86e7cd52a5..b5ce563a3c 100644 --- a/src/openrct2-ui/windows/SceneryScatter.cpp +++ b/src/openrct2-ui/windows/SceneryScatter.cpp @@ -35,18 +35,18 @@ ScatterToolDensity gWindowSceneryScatterDensity; // clang-format off static rct_widget window_scenery_scatter_widgets[] = { - MakeWidget ({ 0, 0}, {86, 100}, WWT_FRAME, 1 ), // panel / background - MakeWidget ({ 1, 1}, {84, 14}, WWT_CAPTION, 0, STR_SCENERY_SCATTER, STR_WINDOW_TITLE_TIP ), // title bar - MakeWidget ({73, 2}, {11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), // close x button + MakeWidget ({ 0, 0}, {86, 100}, WWT_FRAME, WindowColour::Secondary ), // panel / background + MakeWidget ({ 1, 1}, {84, 14}, WWT_CAPTION, WindowColour::Primary , STR_SCENERY_SCATTER, STR_WINDOW_TITLE_TIP ), // title bar + MakeWidget ({73, 2}, {11, 12}, WWT_CLOSEBOX, WindowColour::Primary , STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), // close x button - MakeWidget ({20, 17}, {44, 32}, WWT_IMGBTN, 1, SPR_LAND_TOOL_SIZE_0 ), // preview box - MakeRemapWidget({21, 18}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size - MakeRemapWidget({47, 32}, {16, 16}, WWT_TRNBTN, 1, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size + MakeWidget ({20, 17}, {44, 32}, WWT_IMGBTN, WindowColour::Secondary, SPR_LAND_TOOL_SIZE_0 ), // preview box + MakeRemapWidget({21, 18}, {16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP ), // decrement size + MakeRemapWidget({47, 32}, {16, 16}, WWT_TRNBTN, WindowColour::Secondary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP ), // increment size - MakeWidget ({ 3, 55}, {80, 42}, WWT_GROUPBOX, 1, STR_SCATTER_TOOL_DENSITY ), - MakeRemapWidget({ 7, 68}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_SCENERY_SCATTER_LOW, STR_SCATTER_TOOL_DENSITY_LOW ), // low amount - MakeRemapWidget({31, 68}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_SCENERY_SCATTER_MEDIUM, STR_SCATTER_TOOL_DENSITY_MEDIUM), // medium amount - MakeRemapWidget({55, 68}, {24, 24}, WWT_FLATBTN, 1, SPR_G2_SCENERY_SCATTER_HIGH, STR_SCATTER_TOOL_DENSITY_HIGH ), // high amount + MakeWidget ({ 3, 55}, {80, 42}, WWT_GROUPBOX, WindowColour::Secondary, STR_SCATTER_TOOL_DENSITY ), + MakeRemapWidget({ 7, 68}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_SCENERY_SCATTER_LOW, STR_SCATTER_TOOL_DENSITY_LOW ), // low amount + MakeRemapWidget({31, 68}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_SCENERY_SCATTER_MEDIUM, STR_SCATTER_TOOL_DENSITY_MEDIUM), // medium amount + MakeRemapWidget({55, 68}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_G2_SCENERY_SCATTER_HIGH, STR_SCATTER_TOOL_DENSITY_HIGH ), // high amount { WIDGETS_END }, }; // clang-format on diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 0f239eb6b8..5e024d2e25 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -58,14 +58,14 @@ enum { }; static rct_widget window_server_list_widgets[] = { - MakeWidget({ 0, 0}, {341, 91}, WWT_FRAME, 0 ), // panel / background - MakeWidget({ 1, 1}, {338, 14}, WWT_CAPTION, 0, STR_SERVER_LIST, 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({100, 20}, {245, 12}, WWT_TEXT_BOX, 1 ), // player name text box - MakeWidget({ 6, 37}, {332, 14}, WWT_SCROLL, 1 ), // server list - MakeWidget({ 6, 53}, {101, 14}, WWT_BUTTON, 1, STR_FETCH_SERVERS ), // fetch servers button - MakeWidget({112, 53}, {101, 14}, WWT_BUTTON, 1, STR_ADD_SERVER ), // add server button - MakeWidget({218, 53}, {101, 14}, WWT_BUTTON, 1, STR_START_SERVER ), // start server button + MakeWidget({ 0, 0}, {341, 91}, WWT_FRAME, WindowColour::Primary ), // panel / background + MakeWidget({ 1, 1}, {338, 14}, WWT_CAPTION, WindowColour::Primary , STR_SERVER_LIST, STR_WINDOW_TITLE_TIP), // title bar + MakeWidget({327, 2}, { 11, 12}, WWT_CLOSEBOX, WindowColour::Primary , STR_CLOSE_X, STR_CLOSE_WINDOW_TIP), // close x button + MakeWidget({100, 20}, {245, 12}, WWT_TEXT_BOX, WindowColour::Secondary ), // player name text box + MakeWidget({ 6, 37}, {332, 14}, WWT_SCROLL, WindowColour::Secondary ), // server list + MakeWidget({ 6, 53}, {101, 14}, WWT_BUTTON, WindowColour::Secondary, STR_FETCH_SERVERS ), // fetch servers button + MakeWidget({112, 53}, {101, 14}, WWT_BUTTON, WindowColour::Secondary, STR_ADD_SERVER ), // add server button + MakeWidget({218, 53}, {101, 14}, WWT_BUTTON, WindowColour::Secondary, STR_START_SERVER ), // start server button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 601e013ec6..2a1c0bea2f 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -50,18 +50,18 @@ static constexpr const int32_t WW = 300; static constexpr const int32_t WH = 154; static rct_widget window_server_start_widgets[] = { - MakeWidget ({ 0, 0}, { WW, WH}, WWT_FRAME, 0 ), // panel / background - MakeWidget ({ 1, 1}, {298, 14}, WWT_CAPTION, 0, STR_START_SERVER, STR_WINDOW_TITLE_TIP ), // title bar - MakeWidget ({WW-13, 2}, { 11, 12}, WWT_CLOSEBOX, 0, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), // close x button - MakeWidget ({ 120, 20}, {173, 13}, WWT_TEXT_BOX, 1 ), // port text box - MakeWidget ({ 120, 36}, {173, 13}, WWT_TEXT_BOX, 1 ), // name text box - MakeWidget ({ 120, 52}, {173, 13}, WWT_TEXT_BOX, 1 ), // description text box - MakeWidget ({ 120, 68}, {173, 13}, WWT_TEXT_BOX, 1 ), // greeting text box - MakeWidget ({ 120, 84}, {173, 13}, WWT_TEXT_BOX, 1 ), // password text box - MakeSpinnerWidgets({ 120, 100}, {173, 12}, WWT_SPINNER, 1, STR_SERVER_MAX_PLAYERS_VALUE ), // max players (3 widgets) - MakeWidget ({ 6, 117}, {287, 14}, WWT_CHECKBOX, 1, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP), // advertise checkbox - MakeWidget ({ 6, WH-6-13}, {101, 14}, WWT_BUTTON, 1, STR_NEW_GAME ), // start server button - MakeWidget ({ 112, WH-6-13}, {101, 14}, WWT_BUTTON, 1, STR_LOAD_GAME ), // None + MakeWidget ({ 0, 0}, { WW, WH}, WWT_FRAME, WindowColour::Primary ), // panel / background + MakeWidget ({ 1, 1}, {298, 14}, WWT_CAPTION, WindowColour::Primary , STR_START_SERVER, STR_WINDOW_TITLE_TIP ), // title bar + MakeWidget ({WW-13, 2}, { 11, 12}, WWT_CLOSEBOX, WindowColour::Primary , STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), // close x button + MakeWidget ({ 120, 20}, {173, 13}, WWT_TEXT_BOX, WindowColour::Secondary ), // port text box + MakeWidget ({ 120, 36}, {173, 13}, WWT_TEXT_BOX, WindowColour::Secondary ), // name text box + MakeWidget ({ 120, 52}, {173, 13}, WWT_TEXT_BOX, WindowColour::Secondary ), // description text box + MakeWidget ({ 120, 68}, {173, 13}, WWT_TEXT_BOX, WindowColour::Secondary ), // greeting text box + MakeWidget ({ 120, 84}, {173, 13}, WWT_TEXT_BOX, WindowColour::Secondary ), // password text box + MakeSpinnerWidgets({ 120, 100}, {173, 12}, WWT_SPINNER, WindowColour::Secondary, STR_SERVER_MAX_PLAYERS_VALUE ), // max players (3 widgets) + MakeWidget ({ 6, 117}, {287, 14}, WWT_CHECKBOX, WindowColour::Secondary, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP), // advertise checkbox + MakeWidget ({ 6, WH-6-13}, {101, 14}, WWT_BUTTON, WindowColour::Secondary, STR_NEW_GAME ), // start server button + MakeWidget ({ 112, WH-6-13}, {101, 14}, WWT_BUTTON, WindowColour::Secondary, STR_LOAD_GAME ), // None { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp index fdc0c23c18..a996338472 100644 --- a/src/openrct2-ui/windows/ShortcutKeys.cpp +++ b/src/openrct2-ui/windows/ShortcutKeys.cpp @@ -36,8 +36,8 @@ enum WINDOW_SHORTCUT_WIDGET_IDX { // 0x9DE48C static rct_widget window_shortcut_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({4, 18}, {412, 245}, WWT_SCROLL, 0, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ), - MakeWidget({4, WH-15}, {150, 12}, WWT_BUTTON, 0, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP), + MakeWidget({4, 18}, {412, 245}, WWT_SCROLL, WindowColour::Primary, SCROLL_VERTICAL, STR_SHORTCUT_LIST_TIP ), + MakeWidget({4, WH-15}, {150, 12}, WWT_BUTTON, WindowColour::Primary, STR_SHORTCUT_ACTION_RESET, STR_SHORTCUT_ACTION_RESET_TIP), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 764bb3b022..0e156a2759 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -44,11 +44,11 @@ enum WINDOW_SIGN_WIDGET_IDX { // 0x9AEE00 static rct_widget window_sign_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 3, 17}, {85, 60}, WWT_VIEWPORT, 1, STR_VIEWPORT ), // Viewport - MakeWidget({WW - 25, 19}, {24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_CHANGE_SIGN_TEXT_TIP ), // change sign button - MakeWidget({WW - 25, 67}, {24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_DEMOLISH_SIGN_TIP ), // demolish button - MakeWidget({ 5, WH - 16}, {12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // Main colour - MakeWidget({ 17, WH - 16}, {12, 12}, WWT_COLOURBTN, 1, 0xFFFFFFFF, STR_SELECT_TEXT_COLOUR_TIP ), // Text colour + MakeWidget({ 3, 17}, {85, 60}, WWT_VIEWPORT, WindowColour::Secondary, STR_VIEWPORT ), // Viewport + MakeWidget({WW - 25, 19}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RENAME, STR_CHANGE_SIGN_TEXT_TIP ), // change sign button + MakeWidget({WW - 25, 67}, {24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH, STR_DEMOLISH_SIGN_TIP ), // demolish button + MakeWidget({ 5, WH - 16}, {12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_MAIN_SIGN_COLOUR_TIP), // Main colour + MakeWidget({ 17, WH - 16}, {12, 12}, WWT_COLOURBTN, WindowColour::Secondary, 0xFFFFFFFF, STR_SELECT_TEXT_COLOUR_TIP ), // Text colour { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 6601faaed3..b03501a804 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -72,32 +72,32 @@ 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 */ \ - 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 */ + MakeWidget({ 0, 43}, {190, 137}, WWT_RESIZE, WindowColour::Secondary), /* 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, - MakeWidget ({ 3, 47}, {162, 120}, WWT_VIEWPORT, 1 ), // Viewport - MakeWidget ({ 3, WH - 13}, {162, 11}, WWT_LABEL_CENTRED, 1 ), // Label at bottom of viewport - MakeWidget ({WW - 25, 45}, { 24, 24}, WWT_FLATBTN, 1, SPR_PICKUP_BTN, STR_PICKUP_TIP ), // Pickup Button - MakeWidget ({WW - 25, 69}, { 24, 24}, WWT_FLATBTN, 1, SPR_PATROL_BTN, STR_SET_PATROL_TIP ), // Patrol Button - MakeWidget ({WW - 25, 93}, { 24, 24}, WWT_FLATBTN, 1, SPR_RENAME, STR_NAME_STAFF_TIP ), // Rename Button - MakeWidget ({WW - 25, 117}, { 24, 24}, WWT_FLATBTN, 1, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP), // Locate Button - MakeWidget ({WW - 25, 141}, { 24, 24}, WWT_FLATBTN, 1, SPR_DEMOLISH, STR_FIRE_STAFF_TIP ), // Fire Button + MakeWidget ({ 3, 47}, {162, 120}, WWT_VIEWPORT, WindowColour::Secondary ), // Viewport + MakeWidget ({ 3, WH - 13}, {162, 11}, WWT_LABEL_CENTRED, WindowColour::Secondary ), // Label at bottom of viewport + MakeWidget ({WW - 25, 45}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PICKUP_BTN, STR_PICKUP_TIP ), // Pickup Button + MakeWidget ({WW - 25, 69}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PATROL_BTN, STR_SET_PATROL_TIP ), // Patrol Button + MakeWidget ({WW - 25, 93}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_RENAME, STR_NAME_STAFF_TIP ), // Rename Button + MakeWidget ({WW - 25, 117}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP), // Locate Button + MakeWidget ({WW - 25, 141}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH, STR_FIRE_STAFF_TIP ), // Fire Button { WIDGETS_END }, }; //0x9AF910 static rct_widget window_staff_options_widgets[] = { MAIN_STAFF_WIDGETS, - MakeWidget ({ 5, 50}, {180, 12}, WWT_CHECKBOX, 1 ), // Checkbox 1 - MakeWidget ({ 5, 67}, {180, 12}, WWT_CHECKBOX, 1 ), // Checkbox 2 - MakeWidget ({ 5, 84}, {180, 12}, WWT_CHECKBOX, 1 ), // Checkbox 3 - MakeWidget ({ 5, 101}, {180, 12}, WWT_CHECKBOX, 1 ), // Checkbox 4 - MakeWidget ({ 5, 50}, {180, 12}, WWT_DROPDOWN, 1 ), // Costume Dropdown - MakeWidget ({WW - 17, 51}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH, STR_SELECT_COSTUME_TIP), // Costume Dropdown Button + MakeWidget ({ 5, 50}, {180, 12}, WWT_CHECKBOX, WindowColour::Secondary ), // Checkbox 1 + MakeWidget ({ 5, 67}, {180, 12}, WWT_CHECKBOX, WindowColour::Secondary ), // Checkbox 2 + MakeWidget ({ 5, 84}, {180, 12}, WWT_CHECKBOX, WindowColour::Secondary ), // Checkbox 3 + MakeWidget ({ 5, 101}, {180, 12}, WWT_CHECKBOX, WindowColour::Secondary ), // Checkbox 4 + MakeWidget ({ 5, 50}, {180, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Costume Dropdown + MakeWidget ({WW - 17, 51}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH, STR_SELECT_COSTUME_TIP), // Costume Dropdown Button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp index 12e67d5882..886a5694bc 100644 --- a/src/openrct2-ui/windows/StaffFirePrompt.cpp +++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp @@ -32,8 +32,8 @@ enum WINDOW_STAFF_FIRE_WIDGET_IDX { // 0x9AFB4C static rct_widget window_staff_fire_widgets[] = { WINDOW_SHIM_WHITE(WINDOW_TITLE, WW, WH), - MakeWidget({ 10, WH - 20}, {85, 14}, WWT_BUTTON, 0, STR_YES ), - MakeWidget({WW - 95, WH - 20}, {85, 14}, WWT_BUTTON, 0, STR_SAVE_PROMPT_CANCEL), + MakeWidget({ 10, WH - 20}, {85, 14}, WWT_BUTTON, WindowColour::Primary, STR_YES ), + MakeWidget({WW - 95, WH - 20}, {85, 14}, WWT_BUTTON, WindowColour::Primary, STR_SAVE_PROMPT_CANCEL), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index ac52983f63..dd3ff6c863 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 - 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 + MakeWidget({ 0, 43}, { WW, WH - 43}, WWT_RESIZE, WindowColour::Secondary ), // 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, WindowColour::Secondary, SCROLL_VERTICAL ), // staff list + MakeWidget({130, 58}, { 12, 12}, WWT_COLOURBTN, WindowColour::Secondary, STR_NONE, STR_UNIFORM_COLOUR_TIP ), // uniform colour picker + MakeWidget({165, 17}, { 145, 13}, WWT_BUTTON, WindowColour::Primary , STR_NONE, STR_HIRE_STAFF_TIP ), // hire button + MakeWidget({243, 46}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_DEMOLISH, STR_QUICK_FIRE_STAFF ), // quick fire staff + MakeWidget({267, 46}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_PATROL_BTN, STR_SHOW_PATROL_AREA_TIP ), // show staff patrol area tool + MakeWidget({291, 46}, { 24, 24}, WWT_FLATBTN, WindowColour::Secondary, SPR_MAP, STR_SHOW_STAFF_ON_MAP_TIP ), // show staff on map button { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index 88c65a9d1e..6aeb548cca 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -41,8 +41,8 @@ enum WINDOW_TEXT_INPUT_WIDGET_IDX { // 0x9DE4E0 static rct_widget window_text_input_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({170, 68}, {71, 14}, WWT_BUTTON, 1, STR_CANCEL), - MakeWidget({ 10, 68}, {71, 14}, WWT_BUTTON, 1, STR_OK ), + MakeWidget({170, 68}, {71, 14}, WWT_BUTTON, WindowColour::Secondary, STR_CANCEL), + MakeWidget({ 10, 68}, {71, 14}, WWT_BUTTON, WindowColour::Secondary, STR_OK ), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp index e74c183c51..dabb7276a0 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 - 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 + MakeWidget({ 0, 43}, {320, 64}, WWT_RESIZE, WindowColour::Secondary ), // 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, WindowColour::Secondary, STR_THEMES_HEADER_WINDOW ), // Window header + MakeWidget({219, 46}, { 97, 15}, WWT_TABLE_HEADER, WindowColour::Secondary, STR_THEMES_HEADER_PALETTE ), // Palette header + MakeWidget({125, 60}, {175, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Preset colour schemes + MakeWidget({288, 61}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), + MakeWidget({ 10, 82}, { 91, 12}, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_ACTION_DUPLICATE_TIP ), // Duplicate button + MakeWidget({110, 82}, { 91, 12}, WWT_BUTTON, WindowColour::Secondary, STR_TRACK_MANAGE_DELETE, STR_THEMES_ACTION_DELETE_TIP ), // Delete button + MakeWidget({210, 82}, { 91, 12}, WWT_BUTTON, WindowColour::Secondary, STR_TRACK_MANAGE_RENAME, STR_THEMES_ACTION_RENAME_TIP ), // Rename button + MakeWidget({ 0, 0}, { 1, 1}, WWT_COLOURBTN, WindowColour::Secondary ), // colour button mask + MakeWidget({ 3, 60}, {314, 44}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL ), // staff list + MakeWidget({ 10, 54}, {290, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_THEMES_OPTION_RCT1_RIDE_CONTROLS ), // rct1 ride lights + MakeWidget({ 10, 69}, {290, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_THEMES_OPTION_RCT1_PARK_CONTROLS ), // rct1 park lights + MakeWidget({ 10, 84}, {290, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_THEMES_OPTION_RCT1_SCENARIO_SELECTION_FONT ), // rct1 scenario font + MakeWidget({ 10, 99}, {290, 12}, WWT_CHECKBOX, WindowColour::Secondary, STR_THEMES_OPTION_RCT1_BOTTOM_TOOLBAR ), // rct1 bottom toolbar { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index 1682d7902b..56a961e220 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -86,24 +86,24 @@ static TitleSequence * _sequence = nullptr; static rct_widget window_title_command_editor_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 16, 32}, { 168, 12}, WWT_DROPDOWN, 1 ), // Command dropdown - MakeWidget({172, 33}, { 11, 12}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - MakeWidget({ 16, 70}, { 168, 12}, WWT_TEXT_BOX, 1 ), // full textbox + MakeWidget({ 16, 32}, { 168, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Command dropdown + MakeWidget({172, 33}, { 11, 12}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), + MakeWidget({ 16, 70}, { 168, 12}, WWT_TEXT_BOX, WindowColour::Secondary ), // full textbox - MakeWidget({ 16, 70}, { 81, 12}, WWT_TEXT_BOX, 1 ), // x textbox - MakeWidget({103, 70}, { 81, 12}, WWT_TEXT_BOX, 1 ), // y textbox + MakeWidget({ 16, 70}, { 81, 12}, WWT_TEXT_BOX, WindowColour::Secondary ), // x textbox + MakeWidget({103, 70}, { 81, 12}, WWT_TEXT_BOX, WindowColour::Secondary ), // y textbox - MakeWidget({ 16, 70}, { 168, 12}, WWT_DROPDOWN, 1 ), // Save dropdown - MakeWidget({172, 71}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), + MakeWidget({ 16, 70}, { 168, 12}, WWT_DROPDOWN, WindowColour::Secondary ), // Save dropdown + MakeWidget({172, 71}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), - MakeWidget({103, 56}, { 81, 12}, WWT_BUTTON, 1, STR_TITLE_COMMAND_EDITOR_ACTION_GET_LOCATION ), // Get location/zoom/etc - MakeWidget({112, 56}, { 72, 12}, WWT_BUTTON, 1, STR_TITLE_COMMAND_EDITOR_ACTION_SELECT_SCENARIO), // Select scenario + MakeWidget({103, 56}, { 81, 12}, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_COMMAND_EDITOR_ACTION_GET_LOCATION ), // Get location/zoom/etc + MakeWidget({112, 56}, { 72, 12}, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_COMMAND_EDITOR_ACTION_SELECT_SCENARIO), // Select scenario - MakeWidget({ 16, 56}, { 168, 12}, WWT_BUTTON, 1, STR_TITLE_COMMAND_EDITOR_SELECT_SPRITE ), // Select sprite - MakeWidget({ 16, 70}, { 168, 24}, WWT_VIEWPORT, 1 ), // Viewport + MakeWidget({ 16, 56}, { 168, 12}, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_COMMAND_EDITOR_SELECT_SPRITE ), // Select sprite + MakeWidget({ 16, 70}, { 168, 24}, WWT_VIEWPORT, WindowColour::Secondary ), // Viewport - MakeWidget({ 10, 99}, { 71, 14}, WWT_BUTTON, 1, STR_OK ), // OKAY - MakeWidget({120, 99}, { 71, 14}, WWT_BUTTON, 1, STR_CANCEL ), // Cancel + MakeWidget({ 10, 99}, { 71, 14}, WWT_BUTTON, WindowColour::Secondary, STR_OK ), // OKAY + MakeWidget({120, 99}, { 71, 14}, WWT_BUTTON, WindowColour::Secondary, STR_CANCEL ), // Cancel { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 28fc992804..95a79c2b7d 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -148,40 +148,40 @@ 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 - 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 + MakeWidget({ 0, 43}, { 320, 84}, WWT_RESIZE, WindowColour::Secondary ), // 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, WindowColour::Secondary, SCROLL_BOTH), // command/save list // Presets Tab - MakeWidget ({ 125, 60}, { 175, 14}, WWT_DROPDOWN, 1 ), // Preset title sequences - MakeWidget ({ 288, 61}, { 11, 10}, WWT_BUTTON, 1, STR_DROPDOWN_GLYPH ), - MakeWidget ({ 10, 82}, ACTION_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_CREATE, STR_TITLE_EDITOR_ACTION_CREATE_SEQUENCE_TIP ), // Create button - MakeWidget ({ 10, 102}, ACTION_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ACTION_DUPLICATE_SEQUENCE_TIP), // Duplicate button - MakeWidget ({ 110, 82}, ACTION_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_SEQUENCE_TIP ), // Delete button - MakeWidget ({ 210, 82}, ACTION_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_SEQUENCE_TIP ), // Rename button + MakeWidget ({ 125, 60}, { 175, 14}, WWT_DROPDOWN, WindowColour::Secondary ), // Preset title sequences + MakeWidget ({ 288, 61}, { 11, 10}, WWT_BUTTON, WindowColour::Secondary, STR_DROPDOWN_GLYPH ), + MakeWidget ({ 10, 82}, ACTION_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_CREATE, STR_TITLE_EDITOR_ACTION_CREATE_SEQUENCE_TIP ), // Create button + MakeWidget ({ 10, 102}, ACTION_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ACTION_DUPLICATE_SEQUENCE_TIP), // Duplicate button + MakeWidget ({ 110, 82}, ACTION_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_SEQUENCE_TIP ), // Delete button + MakeWidget ({ 210, 82}, ACTION_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_SEQUENCE_TIP ), // Rename button // Saves Tab - MakeWidget ({ 8, 52}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_ADD, STR_TITLE_EDITOR_ACTION_ADD_TIP ), // Add - MakeWidget ({ 8, 70}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_REMOVE, STR_TITLE_EDITOR_ACTION_REMOVE_TIP ), // Remove - MakeWidget ({ 8, 88}, EDIT_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_TIP ), // Rename - MakeWidget ({ 8, 106}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_LOAD, STR_TITLE_EDITOR_ACTION_LOAD_TIP ), // Load + MakeWidget ({ 8, 52}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_ADD, STR_TITLE_EDITOR_ACTION_ADD_TIP ), // Add + MakeWidget ({ 8, 70}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_REMOVE, STR_TITLE_EDITOR_ACTION_REMOVE_TIP ), // Remove + MakeWidget ({ 8, 88}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ACTION_RENAME_TIP ), // Rename + MakeWidget ({ 8, 106}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_LOAD, STR_TITLE_EDITOR_ACTION_LOAD_TIP ), // Load // Script Tab - MakeWidget ({ 8, 52}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_INSERT, STR_TITLE_EDITOR_ACTION_INSERT_TIP ), // Insert - MakeWidget ({ 8, 70}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_EDIT, STR_TITLE_EDITOR_ACTION_EDIT_TIP ), // Edit - MakeWidget ({ 8, 88}, EDIT_BTN, WWT_BUTTON, 1, STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_TIP ), // Delete - // MakeWidget ({ 8, 106}, EDIT_BTN, WWT_DROPDOWN_BUTTON, 1, STR_TITLE_EDITOR_ACTION_RELOAD, STR_TITLE_EDITOR_ACTION_RELOAD_TIP ), // Reload - MakeWidget ({ 8, 106}, EDIT_BTN, WWT_BUTTON, 1, STR_TITLE_EDITOR_ACTION_SKIP_TO, STR_TITLE_EDITOR_ACTION_SKIP_TO_TIP ), // Skip to + MakeWidget ({ 8, 52}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_INSERT, STR_TITLE_EDITOR_ACTION_INSERT_TIP ), // Insert + MakeWidget ({ 8, 70}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_EDIT, STR_TITLE_EDITOR_ACTION_EDIT_TIP ), // Edit + MakeWidget ({ 8, 88}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TRACK_MANAGE_DELETE, STR_TITLE_EDITOR_ACTION_DELETE_TIP ), // Delete + // MakeWidget ({ 8, 106}, EDIT_BTN, WWT_DROPDOWN_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_RELOAD, STR_TITLE_EDITOR_ACTION_RELOAD_TIP ), // Reload + MakeWidget ({ 8, 106}, EDIT_BTN, WWT_BUTTON, WindowColour::Secondary, STR_TITLE_EDITOR_ACTION_SKIP_TO, STR_TITLE_EDITOR_ACTION_SKIP_TO_TIP ), // Skip to - MakeWidget ({ 8, 142}, REORDER_BTN, WWT_BUTTON, 1, STR_DOWN, STR_TITLE_EDITOR_ACTION_MOVE_DOWN_TIP ), // Move down - MakeWidget ({ 44, 142}, REORDER_BTN, WWT_BUTTON, 1, STR_UP, STR_TITLE_EDITOR_ACTION_MOVE_UP_TIP ), // Move up + MakeWidget ({ 8, 142}, REORDER_BTN, WWT_BUTTON, WindowColour::Secondary, STR_DOWN, STR_TITLE_EDITOR_ACTION_MOVE_DOWN_TIP ), // Move down + MakeWidget ({ 44, 142}, REORDER_BTN, WWT_BUTTON, WindowColour::Secondary, STR_UP, STR_TITLE_EDITOR_ACTION_MOVE_UP_TIP ), // Move up - MakeWidget ({ 8, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_RESTART, STR_TITLE_EDITOR_ACTION_REPLAY_TIP ), // Replay - MakeWidget ({ 26, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_STOP, STR_TITLE_EDITOR_ACTION_STOP_TIP ), // Stop - MakeWidget ({ 44, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_PLAY, STR_TITLE_EDITOR_ACTION_PLAY_TIP ), // Play - MakeWidget ({ 62, 238}, PLAYBACK_BTN, WWT_IMGBTN, 1, SPR_G2_TITLE_SKIP, STR_TITLE_EDITOR_ACTION_SKIP_TIP ), // Skip + MakeWidget ({ 8, 238}, PLAYBACK_BTN, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_TITLE_RESTART, STR_TITLE_EDITOR_ACTION_REPLAY_TIP ), // Replay + MakeWidget ({ 26, 238}, PLAYBACK_BTN, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_TITLE_STOP, STR_TITLE_EDITOR_ACTION_STOP_TIP ), // Stop + MakeWidget ({ 44, 238}, PLAYBACK_BTN, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_TITLE_PLAY, STR_TITLE_EDITOR_ACTION_PLAY_TIP ), // Play + MakeWidget ({ 62, 238}, PLAYBACK_BTN, WWT_IMGBTN, WindowColour::Secondary, SPR_G2_TITLE_SKIP, STR_TITLE_EDITOR_ACTION_SKIP_TIP ), // Skip { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp index 2e55ab6b03..ac2d76208d 100644 --- a/src/openrct2-ui/windows/TitleExit.cpp +++ b/src/openrct2-ui/windows/TitleExit.cpp @@ -21,7 +21,7 @@ enum WINDOW_TITLE_EXIT_WIDGET_IDX { }; static rct_widget window_title_exit_widgets[] = { - MakeWidget({0, 0}, {40, 64}, WWT_IMGBTN, 2, SPR_MENU_EXIT, STR_EXIT), + MakeWidget({0, 0}, {40, 64}, WWT_IMGBTN, WindowColour::Tertiary, SPR_MENU_EXIT, STR_EXIT), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp index ef107275c9..c5a9f96b38 100644 --- a/src/openrct2-ui/windows/TitleLogo.cpp +++ b/src/openrct2-ui/windows/TitleLogo.cpp @@ -23,7 +23,7 @@ enum }; static rct_widget window_title_logo_widgets[] = { - MakeWidget({ 0, 0 }, { WW + 1, WH + 1 }, WWT_IMGBTN, 0), + MakeWidget({ 0, 0 }, { WW + 1, WH + 1 }, WWT_IMGBTN, WindowColour::Primary), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index a97d992e66..bb17e71c1d 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -34,11 +34,11 @@ enum { static ScreenRect _filterRect; static rct_widget window_title_menu_widgets[] = { - MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, 2, SPR_MENU_NEW_GAME, STR_START_NEW_GAME_TIP), - MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, 2, SPR_MENU_LOAD_GAME, STR_CONTINUE_SAVED_GAME_TIP), - MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, 2, SPR_G2_MENU_MULTIPLAYER, STR_SHOW_MULTIPLAYER_TIP), - MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, 2, SPR_MENU_TOOLBOX, STR_GAME_TOOLS_TIP), - MakeWidget({0, 0}, {82 * 4, 28}, WWT_EMPTY, 1, STR_UPDATE_AVAILABLE), + MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, WindowColour::Tertiary , SPR_MENU_NEW_GAME, STR_START_NEW_GAME_TIP), + MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, WindowColour::Tertiary , SPR_MENU_LOAD_GAME, STR_CONTINUE_SAVED_GAME_TIP), + MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, WindowColour::Tertiary , SPR_G2_MENU_MULTIPLAYER, STR_SHOW_MULTIPLAYER_TIP), + MakeWidget({0, 28}, { 82, 82}, WWT_IMGBTN, WindowColour::Tertiary , SPR_MENU_TOOLBOX, STR_GAME_TOOLS_TIP), + MakeWidget({0, 0}, {82 * 4, 28}, WWT_EMPTY, WindowColour::Secondary, STR_UPDATE_AVAILABLE), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp index 4eaa46e6c2..50b98fdecb 100644 --- a/src/openrct2-ui/windows/TitleOptions.cpp +++ b/src/openrct2-ui/windows/TitleOptions.cpp @@ -20,7 +20,7 @@ enum WINDOW_TITLE_OPTIONS_WIDGET_IDX { }; static rct_widget window_title_options_widgets[] = { - MakeWidget({0, 0}, {80, 15}, WWT_BUTTON, 2, STR_OPTIONS, STR_OPTIONS_TIP), + MakeWidget({0, 0}, {80, 15}, WWT_BUTTON, WindowColour::Tertiary, STR_OPTIONS, STR_OPTIONS_TIP), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp index 78464a6569..64ea78a4cd 100644 --- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp +++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp @@ -74,16 +74,16 @@ enum { static rct_widget window_scenarioselect_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 0, 50}, {734, 284}, WWT_IMGBTN, 1), // tab content panel - MakeRemapWidget({ 3, 17}, { 91, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 1 - MakeRemapWidget({ 94, 17}, { 91, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 2 - MakeRemapWidget({185, 17}, { 91, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 3 - MakeRemapWidget({276, 17}, { 91, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 4 - MakeRemapWidget({367, 17}, { 91, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 5 - MakeRemapWidget({458, 17}, {136, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 6 - MakeRemapWidget({594, 17}, { 91, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 7 - MakeRemapWidget({685, 17}, { 91, 34}, WWT_TAB, 1, SPR_TAB_LARGE), // tab 8 - MakeWidget ({ 3, 54}, {553, 276}, WWT_SCROLL, 1, SCROLL_VERTICAL), // level list + MakeWidget ({ 0, 50}, {734, 284}, WWT_IMGBTN, WindowColour::Secondary), // tab content panel + MakeRemapWidget({ 3, 17}, { 91, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 1 + MakeRemapWidget({ 94, 17}, { 91, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 2 + MakeRemapWidget({185, 17}, { 91, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 3 + MakeRemapWidget({276, 17}, { 91, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 4 + MakeRemapWidget({367, 17}, { 91, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 5 + MakeRemapWidget({458, 17}, {136, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 6 + MakeRemapWidget({594, 17}, { 91, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 7 + MakeRemapWidget({685, 17}, { 91, 34}, WWT_TAB, WindowColour::Secondary, SPR_TAB_LARGE), // tab 8 + MakeWidget ({ 3, 54}, {553, 276}, WWT_SCROLL, WindowColour::Secondary, SCROLL_VERTICAL), // level list { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp index 6b168b614c..c122757526 100644 --- a/src/openrct2-ui/windows/Tooltip.cpp +++ b/src/openrct2-ui/windows/Tooltip.cpp @@ -21,7 +21,7 @@ enum { }; static rct_widget window_tooltip_widgets[] = { - MakeWidget({0, 0}, {200, 32}, WWT_IMGBTN, 0), + MakeWidget({0, 0}, {200, 32}, WWT_IMGBTN, WindowColour::Primary), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 75f89d83e1..6576112633 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -229,33 +229,33 @@ static constexpr const int32_t right_aligned_widgets_order[] = { #pragma endregion static rct_widget window_top_toolbar_widgets[] = { - MakeRemapWidget({ 0, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP ), // Pause - MakeRemapWidget({ 60, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP ), // File menu - MakeRemapWidget({250, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP ), // Mute - MakeRemapWidget({100, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // Zoom out - MakeRemapWidget({130, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP ), // Zoom in - MakeRemapWidget({160, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP ), // Rotate camera - MakeRemapWidget({190, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu - MakeRemapWidget({220, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 1, SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map - MakeRemapWidget({267, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land - MakeRemapWidget({297, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water - MakeRemapWidget({327, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery - MakeRemapWidget({357, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path - MakeRemapWidget({387, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride - MakeRemapWidget({490, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides - MakeRemapWidget({520, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park - MakeRemapWidget({550, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff - MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP ), // Guests - MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 2, SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP ), // Clear scenery - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP ), // Fast forward - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_CHEATS_TIP ), // Cheats - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_DEBUG_TIP ), // Debug - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), // Finances - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP ), // Research - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 3, SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP ), // News - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP ), // Network - MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, 0, SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP ), // Chat - MakeWidget ({ 0, 0}, {10, 1}, WWT_EMPTY, 0 ), // Artificial widget separator + MakeRemapWidget({ 0, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_TOOLBAR_PAUSE, STR_PAUSE_GAME_TIP ), // Pause + MakeRemapWidget({ 60, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_TOOLBAR_FILE, STR_DISC_AND_GAME_OPTIONS_TIP ), // File menu + MakeRemapWidget({250, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_G2_TOOLBAR_MUTE, STR_TOOLBAR_MUTE_TIP ), // Mute + MakeRemapWidget({100, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Secondary , SPR_TOOLBAR_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // Zoom out + MakeRemapWidget({130, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Secondary , SPR_TOOLBAR_ZOOM_IN, STR_ZOOM_IN_TIP ), // Zoom in + MakeRemapWidget({160, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Secondary , SPR_TOOLBAR_ROTATE, STR_ROTATE_TIP ), // Rotate camera + MakeRemapWidget({190, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Secondary , SPR_TOOLBAR_VIEW, STR_VIEW_OPTIONS_TIP ), // Transparency menu + MakeRemapWidget({220, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Secondary , SPR_TOOLBAR_MAP, STR_SHOW_MAP_TIP ), // Map + MakeRemapWidget({267, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Tertiary , SPR_TOOLBAR_LAND, STR_ADJUST_LAND_TIP ), // Land + MakeRemapWidget({297, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Tertiary , SPR_TOOLBAR_WATER, STR_ADJUST_WATER_TIP ), // Water + MakeRemapWidget({327, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Tertiary , SPR_TOOLBAR_SCENERY, STR_PLACE_SCENERY_TIP ), // Scenery + MakeRemapWidget({357, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Tertiary , SPR_TOOLBAR_FOOTPATH, STR_BUILD_FOOTPATH_TIP ), // Path + MakeRemapWidget({387, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Tertiary , SPR_TOOLBAR_CONSTRUCT_RIDE, STR_BUILD_RIDE_TIP ), // Construct ride + MakeRemapWidget({490, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Quaternary, SPR_TOOLBAR_RIDES, STR_RIDES_IN_PARK_TIP ), // Rides + MakeRemapWidget({520, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Quaternary, SPR_TOOLBAR_PARK, STR_PARK_INFORMATION_TIP ), // Park + MakeRemapWidget({550, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_STAFF_TIP ), // Staff + MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Quaternary, SPR_TOOLBAR_GUESTS, STR_GUESTS_TIP ), // Guests + MakeRemapWidget({560, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Tertiary , SPR_TOOLBAR_CLEAR_SCENERY, STR_CLEAR_SCENERY_TIP ), // Clear scenery + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_GAME_SPEED_TIP ), // Fast forward + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_CHEATS_TIP ), // Cheats + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_DEBUG_TIP ), // Debug + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_SCENARIO_OPTIONS_FINANCIAL_TIP), // Finances + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_FINANCES_RESEARCH_TIP ), // Research + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Quaternary, SPR_TAB_TOOLBAR, STR_SHOW_RECENT_MESSAGES_TIP ), // News + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_G2_TOOLBAR_MULTIPLAYER, STR_SHOW_MULTIPLAYER_STATUS_TIP ), // Network + MakeRemapWidget({ 30, 0}, {30, TOP_TOOLBAR_HEIGHT + 1}, WWT_TRNBTN, WindowColour::Primary , SPR_TAB_TOOLBAR, STR_TOOLBAR_CHAT_TIP ), // Chat + MakeWidget ({ 0, 0}, {10, 1}, WWT_EMPTY, WindowColour::Primary ), // Artificial widget separator { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index df2c983c81..b335e62458 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -36,15 +36,15 @@ enum { static rct_widget window_track_manage_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 10, 24}, {110, 12}, WWT_BUTTON, 0, STR_TRACK_MANAGE_RENAME), - MakeWidget({130, 24}, {110, 12}, WWT_BUTTON, 0, STR_TRACK_MANAGE_DELETE), + MakeWidget({ 10, 24}, {110, 12}, WWT_BUTTON, WindowColour::Primary, STR_TRACK_MANAGE_RENAME), + MakeWidget({130, 24}, {110, 12}, WWT_BUTTON, WindowColour::Primary, STR_TRACK_MANAGE_DELETE), { WIDGETS_END } }; static rct_widget window_track_delete_prompt_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 10, 54}, {110, 12}, WWT_BUTTON, 0, STR_TRACK_MANAGE_DELETE), - MakeWidget({130, 54}, {110, 12}, WWT_BUTTON, 0, STR_CANCEL ), + MakeWidget({ 10, 54}, {110, 12}, WWT_BUTTON, WindowColour::Primary, STR_TRACK_MANAGE_DELETE), + MakeWidget({130, 54}, {110, 12}, WWT_BUTTON, WindowColour::Primary, STR_CANCEL ), { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 9ec77df793..c075642960 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -62,10 +62,10 @@ validate_global_widx(WC_TRACK_DESIGN_PLACE, WIDX_ROTATE); static rct_widget window_track_place_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({173, 83}, { 24, 24}, WWT_FLATBTN, 0, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), - MakeWidget({173, 59}, { 24, 24}, WWT_FLATBTN, 0, SPR_MIRROR_ARROW, STR_MIRROR_IMAGE_TIP ), - MakeWidget({ 4, 109}, {192, 12}, WWT_BUTTON, 0, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP), - MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, 0), + MakeWidget({173, 83}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), + MakeWidget({173, 59}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary, SPR_MIRROR_ARROW, STR_MIRROR_IMAGE_TIP ), + MakeWidget({ 4, 109}, {192, 12}, WWT_BUTTON, WindowColour::Primary, STR_SELECT_A_DIFFERENT_DESIGN, STR_GO_BACK_TO_DESIGN_SELECTION_WINDOW_TIP), + MakeWidget({ 0, 0}, { 1, 1}, WWT_EMPTY, WindowColour::Primary), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 5217ded2e9..159cad77c3 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -46,13 +46,13 @@ validate_global_widx(WC_TRACK_DESIGN_LIST, WIDX_ROTATE); static rct_widget window_track_list_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 4, 18}, {218, 13}, WWT_TABLE_HEADER, 0, STR_SELECT_OTHER_RIDE ), - MakeWidget({ 4, 32}, {124, 13}, WWT_TEXT_BOX, 1 ), - MakeWidget({130, 32}, { 92, 13}, WWT_BUTTON, 0, STR_OBJECT_SEARCH_CLEAR ), - MakeWidget({ 4, 46}, {218, 381}, WWT_SCROLL, 0, SCROLL_VERTICAL, STR_CLICK_ON_DESIGN_TO_BUILD_IT_TIP), - MakeWidget({224, 18}, {372, 219}, WWT_FLATBTN, 0 ), - MakeWidget({574, 405}, { 24, 24}, WWT_FLATBTN, 0, SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), - MakeWidget({574, 381}, { 24, 24}, WWT_FLATBTN, 0, SPR_SCENERY, STR_TOGGLE_SCENERY_TIP ), + MakeWidget({ 4, 18}, {218, 13}, WWT_TABLE_HEADER, WindowColour::Primary , STR_SELECT_OTHER_RIDE ), + MakeWidget({ 4, 32}, {124, 13}, WWT_TEXT_BOX, WindowColour::Secondary ), + MakeWidget({130, 32}, { 92, 13}, WWT_BUTTON, WindowColour::Primary , STR_OBJECT_SEARCH_CLEAR ), + MakeWidget({ 4, 46}, {218, 381}, WWT_SCROLL, WindowColour::Primary , SCROLL_VERTICAL, STR_CLICK_ON_DESIGN_TO_BUILD_IT_TIP), + MakeWidget({224, 18}, {372, 219}, WWT_FLATBTN, WindowColour::Primary ), + MakeWidget({574, 405}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary , SPR_ROTATE_ARROW, STR_ROTATE_90_TIP ), + MakeWidget({574, 381}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary , SPR_SCENERY, STR_TOGGLE_SCENERY_TIP ), { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index 80bdaa1661..d3732bb8aa 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -51,13 +51,13 @@ static constexpr const int32_t WH = 155; static rct_widget window_view_clipping_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({ 11, 19}, { 159, 11}, WWT_CHECKBOX, 0, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP ), // clip enable/disable check box - MakeWidget ({ 5, 36}, {WW - 10, 48}, WWT_GROUPBOX, 0, STR_VIEW_CLIPPING_VERTICAL_CLIPPING ), - MakeSpinnerWidgets({ 90, 51}, { 79, 12}, WWT_SPINNER, 0, STR_NONE, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE), // clip height (3 widgets) - MakeWidget ({ 11, 66}, { 158, 13}, WWT_SCROLL, 0, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP ), // clip height scrollbar - MakeWidget ({ 5, 90}, {WW - 10, 60}, WWT_GROUPBOX, 0, STR_VIEW_CLIPPING_HORIZONTAL_CLIPPING ), - MakeWidget ({ 11, 105}, { 158, 17}, WWT_BUTTON, 0, STR_VIEW_CLIPPING_SELECT_AREA ), // selector - MakeWidget ({ 11, 126}, { 158, 18}, WWT_BUTTON, 0, STR_VIEW_CLIPPING_CLEAR_SELECTION ), // clear + MakeWidget ({ 11, 19}, { 159, 11}, WWT_CHECKBOX, WindowColour::Primary, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP ), // clip enable/disable check box + MakeWidget ({ 5, 36}, {WW - 10, 48}, WWT_GROUPBOX, WindowColour::Primary, STR_VIEW_CLIPPING_VERTICAL_CLIPPING ), + MakeSpinnerWidgets({ 90, 51}, { 79, 12}, WWT_SPINNER, WindowColour::Primary, STR_NONE, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE), // clip height (3 widgets) + MakeWidget ({ 11, 66}, { 158, 13}, WWT_SCROLL, WindowColour::Primary, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP ), // clip height scrollbar + MakeWidget ({ 5, 90}, {WW - 10, 60}, WWT_GROUPBOX, WindowColour::Primary, STR_VIEW_CLIPPING_HORIZONTAL_CLIPPING ), + MakeWidget ({ 11, 105}, { 158, 17}, WWT_BUTTON, WindowColour::Primary, STR_VIEW_CLIPPING_SELECT_AREA ), // selector + MakeWidget ({ 11, 126}, { 158, 18}, WWT_BUTTON, WindowColour::Primary, STR_VIEW_CLIPPING_CLEAR_SELECTION ), // clear { WIDGETS_END } }; diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 12321c45cc..6b329b60ea 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -33,11 +33,11 @@ enum { static rct_widget window_viewport_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget({ 0, 14}, { WW - 1, WH - 1}, WWT_RESIZE, 1 ), // resize - MakeWidget({ 3, 17}, {WW - 26, WH - 3}, WWT_VIEWPORT, 0 ), // viewport - MakeWidget({WW - 25, 17}, { 24, 24}, WWT_FLATBTN, 0, SPR_G2_ZOOM_IN, STR_ZOOM_IN_TIP ), // zoom in - MakeWidget({WW - 25, 41}, { 24, 24}, WWT_FLATBTN, 0, SPR_G2_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // zoom out - MakeWidget({WW - 25, 65}, { 24, 24}, WWT_FLATBTN, 0, SPR_LOCATE, STR_LOCATE_SUBJECT_TIP), // locate + MakeWidget({ 0, 14}, { WW - 1, WH - 1}, WWT_RESIZE, WindowColour::Secondary ), // resize + MakeWidget({ 3, 17}, {WW - 26, WH - 3}, WWT_VIEWPORT, WindowColour::Primary ), // viewport + MakeWidget({WW - 25, 17}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary , SPR_G2_ZOOM_IN, STR_ZOOM_IN_TIP ), // zoom in + MakeWidget({WW - 25, 41}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary , SPR_G2_ZOOM_OUT, STR_ZOOM_OUT_TIP ), // zoom out + MakeWidget({WW - 25, 65}, { 24, 24}, WWT_FLATBTN, WindowColour::Primary , SPR_LOCATE, STR_LOCATE_SUBJECT_TIP), // locate { WIDGETS_END }, }; diff --git a/src/openrct2-ui/windows/Water.cpp b/src/openrct2-ui/windows/Water.cpp index 01dd892cb4..39a326f07d 100644 --- a/src/openrct2-ui/windows/Water.cpp +++ b/src/openrct2-ui/windows/Water.cpp @@ -32,9 +32,9 @@ enum WINDOW_WATER_WIDGET_IDX { static rct_widget window_water_widgets[] = { WINDOW_SHIM(WINDOW_TITLE, WW, WH), - MakeWidget ({16, 17}, {44, 32}, WWT_IMGBTN, 0, SPR_LAND_TOOL_SIZE_0, STR_NONE), // preview box - MakeRemapWidget({17, 18}, {16, 16}, WWT_TRNBTN, 2, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_WATER_TIP), // decrement size - MakeRemapWidget({43, 32}, {16, 16}, WWT_TRNBTN, 2, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_WATER_TIP), // increment size + MakeWidget ({16, 17}, {44, 32}, WWT_IMGBTN, WindowColour::Primary , SPR_LAND_TOOL_SIZE_0, STR_NONE), // preview box + MakeRemapWidget({17, 18}, {16, 16}, WWT_TRNBTN, WindowColour::Tertiary, SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_WATER_TIP), // decrement size + MakeRemapWidget({43, 32}, {16, 16}, WWT_TRNBTN, WindowColour::Tertiary, SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_WATER_TIP), // increment size { WIDGETS_END }, }; diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h index 9d0fbf6a8d..d0493bcc6c 100644 --- a/src/openrct2/interface/Widget.h +++ b/src/openrct2/interface/Widget.h @@ -59,12 +59,20 @@ enum SCROLL_BOTH = SCROLL_HORIZONTAL | SCROLL_VERTICAL }; +enum class WindowColour : uint8_t +{ + Primary, + Secondary, + Tertiary, + Quaternary, +}; + 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, + const ScreenCoordsXY& origin, const ScreenSize& size, uint8_t type, WindowColour colour, uint32_t content = 0xFFFFFFFF, rct_string_id tooltip = STR_NONE) { rct_widget out = {}; @@ -73,7 +81,7 @@ constexpr rct_widget MakeWidget( out.top = origin.y; out.bottom = origin.y + size.height - 1; out.type = type; - out.colour = colour; + out.colour = static_cast(colour); out.content = content; out.tooltip = tooltip; @@ -81,7 +89,7 @@ constexpr rct_widget MakeWidget( } constexpr rct_widget MakeRemapWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, uint8_t type, uint8_t colour, uint32_t content = 0xFFFFFFFF, + const ScreenCoordsXY& origin, const ScreenSize& size, uint8_t type, WindowColour colour, uint32_t content = 0xFFFFFFFF, rct_string_id tooltip = STR_NONE) { return MakeWidget(origin, size, type, colour, IMAGE_TYPE_REMAP | content, tooltip); @@ -91,7 +99,7 @@ constexpr rct_widget MakeTab(const ScreenCoordsXY& origin, rct_string_id tooltip { const ScreenSize size = TAB_SIZE; const uint8_t type = WWT_TAB; - const uint8_t colour = 1; + const WindowColour colour = WindowColour::Secondary; const uint32_t content = 0xFFFFFFFF; return MakeWidget(origin, size, type, colour, content, tooltip); @@ -101,7 +109,7 @@ constexpr rct_widget MakeTab(const ScreenCoordsXY& origin, rct_string_id tooltip 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, + const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] uint8_t type, WindowColour colour, [[maybe_unused]] uint32_t content = 0xFFFFFFFF, rct_string_id tooltip = STR_NONE) { const int16_t xPos = origin.x + size.width - 26; @@ -113,7 +121,7 @@ constexpr rct_widget MakeSpinnerDecreaseWidget( } constexpr rct_widget MakeSpinnerIncreaseWidget( - const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] uint8_t type, uint8_t colour, + const ScreenCoordsXY& origin, const ScreenSize& size, [[maybe_unused]] uint8_t type, WindowColour colour, [[maybe_unused]] uint32_t content = 0xFFFFFFFF, rct_string_id tooltip = STR_NONE) { const int16_t xPos = origin.x + size.width - 13;