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

Revert renaming of spinners (#7650)

This commit is contained in:
Hielke Morsink 2018-06-10 21:31:08 +02:00 committed by GitHub
parent ef8054b81d
commit 36d123b272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
distribution/changelog.txt
View File

@ -11,7 +11,7 @@
- Feature: [#7332] Keyboard shortcuts for view path issues and cutaway view.
- Feature: [#7348] Add large half loops to the Vertical Drop Roller Coaster.
- Feature: [#7459] Allow opening and closing of parks that use no money.
- Feature: [#7579] New horizontal +/- stepper widgets to make adjusting values easier.
- Feature: [#7579] New horizontal +/- spinner widgets to make adjusting values easier.
- Fix: [#2053] When clearance checks are disabled, a track piece ghost can remove non-ghost track pieces.
- Fix: [#2611] Some objects show (undefined string) instead of a description in Korean.
- Fix: [#3596] Saving parks, landscapes and tracks with a period in the filenames don't get their extension.
@ -54,7 +54,7 @@
- Improved: [#7577] Allow fine-tuning the virtual floor style.
- Improved: [#7608] The vehicle selection dropdown is now sorted orthographically.
- Improved: [#7613] Resizing the staff window now resizes the name and action columns too.
- Improved: [#7627] Allow scrolling up and down on steppers to change their values.
- Improved: [#7627] Allow scrolling up and down on spinners to change their values.
0.1.2 (2018-03-18)
------------------------------------------------------------------------

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

@ -218,14 +218,14 @@ static rct_widget window_cheats_money_widgets[] =
MAIN_CHEATS_WIDGETS,
{ WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(0), HPL(0), STR_MAKE_PARK_NO_MONEY, STR_NONE }, // No money
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(1), HPL(3.5), STR_ADD_SET_MONEY, STR_NONE }, // add / set money group frame
STEPPER_WIDGETS (1, XPL(0), WPL(1) - 10, YPL(2) + 2, HPL(2) - 3, STR_NONE, STR_NONE), // money value (3 widgets)
SPINNER_WIDGETS (1, XPL(0), WPL(1) - 10, YPL(2) + 2, HPL(2) - 3, STR_NONE, STR_NONE), // money value (3 widgets)
{ WWT_BUTTON, 1, XPL(0), WPL(0), YPL(3), HPL(3), STR_ADD_MONEY, STR_NONE }, // add money
{ WWT_BUTTON, 1, XPL(1), WPL(1), YPL(3), HPL(3), STR_SET_MONEY, STR_NONE }, // set money
{ WWT_BUTTON, 1, XPL(0), WPL(0), YPL(5), HPL(5), STR_CHEAT_CLEAR_LOAN, STR_NONE }, // Clear loan
{ WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(6.5), HPL(10.5), STR_DATE_SET, STR_NONE }, // Date group
STEPPER_WIDGETS (1, WPL(0), WPL(1) - 10, YPL(7) + 2, HPL(7) - 3, STR_NONE, STR_NONE), // Year box (3 widgets)
STEPPER_WIDGETS (1, WPL(0), WPL(1) - 10, YPL(8) + 2, HPL(8) - 3, STR_NONE, STR_NONE), // Month box (3 widgets)
STEPPER_WIDGETS (1, WPL(0), WPL(1) - 10, YPL(9) + 2, HPL(9) - 3, STR_NONE, STR_NONE), // Day box (3 widgets)
SPINNER_WIDGETS (1, WPL(0), WPL(1) - 10, YPL(7) + 2, HPL(7) - 3, STR_NONE, STR_NONE), // Year box (3 widgets)
SPINNER_WIDGETS (1, WPL(0), WPL(1) - 10, YPL(8) + 2, HPL(8) - 3, STR_NONE, STR_NONE), // Month box (3 widgets)
SPINNER_WIDGETS (1, WPL(0), WPL(1) - 10, YPL(9) + 2, HPL(9) - 3, STR_NONE, STR_NONE), // Day box (3 widgets)
{ WWT_BUTTON, 1, XPL(0), WPL(0), YPL(10), HPL(10), STR_DATE_SET, STR_NONE }, // Set Date
{ WWT_BUTTON, 1, XPL(1), WPL(1), YPL(10), HPL(10), STR_DATE_RESET, STR_NONE }, // Reset Date
{ WIDGETS_END },
@ -276,7 +276,7 @@ static rct_widget window_cheats_misc_widgets[] =
{ WWT_BUTTON, 1, XPL(1), WPL(1), YPL(2), HPL(2), STR_CHEAT_RESET_DATE, STR_NONE }, // Reset date
{ WWT_BUTTON, 1, XPL(0), WPL(0), YPL(3), HPL(3), STR_CHEAT_OWN_ALL_LAND, STR_CHEAT_OWN_ALL_LAND_TIP }, // Own all land
{ WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(5), HPL(5), STR_FORCE_PARK_RATING, STR_NONE }, // Force park rating
STEPPER_WIDGETS (1, XPL(1), WPL(1) - 10, YPL(5) + 2, HPL(5) - 3, STR_NONE, STR_NONE), // park rating (3 widgets)
SPINNER_WIDGETS (1, XPL(1), WPL(1) - 10, YPL(5) + 2, HPL(5) - 3, STR_NONE, STR_NONE), // park rating (3 widgets)
{ WWT_BUTTON, 1, XPL(0), WPL(0), YPL(6), HPL(6), STR_CHEAT_WIN_SCENARIO, STR_NONE }, // Win scenario
{ WWT_BUTTON, 1, XPL(1), WPL(1), YPL(6), HPL(6), STR_CHEAT_HAVE_FUN, STR_NONE }, // Have fun!
{ WWT_CHECKBOX, 1, XPL(0), OWPL, YPL(7), HPL(7), STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP }, // never ending marketing campaigns

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

@ -41,7 +41,7 @@ static rct_widget window_custom_currency_widgets[] = {
{ WWT_FRAME, 0, 0, 399, 0, 99, 0xFFFFFFFF, STR_NONE },
{ WWT_CAPTION, 0, 1, 398, 1, 14, STR_CUSTOM_CURRENCY_WINDOW_TITLE, STR_WINDOW_TITLE_TIP },
{ WWT_CLOSEBOX, 0, 387, 397, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
STEPPER_WIDGETS (1, 100, 200, 30, 40, STR_CHEAT_CURRENCY_FORMAT, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 100, 200, 30, 40, STR_CHEAT_CURRENCY_FORMAT, STR_NONE), // NB: 3 widgets
{ WWT_BUTTON, 1, 120, 200, 50, 60, 0, STR_NONE },
{ WWT_DROPDOWN, 1, 220, 350, 50, 60, STR_NONE, STR_NONE },
{ WWT_BUTTON, 1, 339, 349, 51, 59, STR_DROPDOWN_GLYPH, STR_NONE },

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

@ -101,8 +101,8 @@ static rct_widget window_editor_objective_options_main_widgets[] = {
MAIN_OBJECTIVE_OPTIONS_WIDGETS,
{ WWT_DROPDOWN, 1, 98, 441, 48, 59, STR_NONE, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP },
{ WWT_BUTTON, 1, 430, 440, 49, 58, STR_DROPDOWN_GLYPH, STR_SELECT_OBJECTIVE_FOR_THIS_SCENARIO_TIP },
STEPPER_WIDGETS (1, 158, 277, 65, 76, STR_NONE, STR_NONE), // NB: 3 widgets
STEPPER_WIDGETS (1, 158, 277, 82, 93, STR_NONE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 158, 277, 65, 76, STR_NONE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 158, 277, 82, 93, STR_NONE, STR_NONE), // NB: 3 widgets
{ WWT_DROPDOWN, 1, 98, 277, 99, 110, STR_NONE, STR_SELECT_CLIMATE_TIP },
{ WWT_BUTTON, 1, 266, 276, 100, 109, STR_DROPDOWN_GLYPH, STR_SELECT_CLIMATE_TIP },
{ WWT_BUTTON, 1, 370, 444, 116, 127, STR_CHANGE, STR_CHANGE_NAME_OF_PARK_TIP },
@ -835,10 +835,10 @@ static void window_editor_objective_options_main_invalidate(rct_window *w)
switch (gScenarioObjectiveType) {
case OBJECTIVE_GUESTS_BY:
case OBJECTIVE_PARK_VALUE_BY:
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1].type = WWT_STEPPER;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1].type = WWT_SPINNER;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WWT_BUTTON;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WWT_BUTTON;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_2].type = WWT_STEPPER;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_2].type = WWT_SPINNER;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_2_INCREASE].type = WWT_BUTTON;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_2_DECREASE].type = WWT_BUTTON;
break;
@ -848,7 +848,7 @@ static void window_editor_objective_options_main_invalidate(rct_window *w)
case OBJECTIVE_FINISH_5_ROLLERCOASTERS:
case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE:
case OBJECTIVE_MONTHLY_FOOD_INCOME:
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1].type = WWT_STEPPER;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1].type = WWT_SPINNER;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WWT_BUTTON;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1_DECREASE].type = WWT_BUTTON;
window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_2].type = WWT_EMPTY;

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

@ -107,10 +107,10 @@ static rct_widget window_editor_scenario_options_financial_widgets[] = {
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP },
{ WWT_CHECKBOX, 1, 8, 271, 48, 59, STR_MAKE_PARK_NO_MONEY, STR_MAKE_PARK_NO_MONEY_TIP },
STEPPER_WIDGETS (1, 168, 267, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets
STEPPER_WIDGETS (1, 168, 267, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets
STEPPER_WIDGETS (1, 168, 267, 99, 110, STR_NONE, STR_NONE ), // NB: 3 widgets
STEPPER_WIDGETS (1, 168, 237, 116, 127, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 168, 267, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 168, 267, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 168, 267, 99, 110, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 168, 237, 116, 127, STR_NONE, STR_NONE ), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 8, 271, 133, 144, STR_FORBID_MARKETING, STR_FORBID_MARKETING_TIP },
{ WIDGETS_END }
};
@ -124,10 +124,10 @@ static rct_widget window_editor_scenario_options_guests_widgets[] = {
{ WWT_TAB, 1, 34, 64, 17, 46, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP },
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP },
STEPPER_WIDGETS (1, 268, 337, 48, 59, STR_NONE, STR_NONE ), // NB: 3 widgets
STEPPER_WIDGETS (1, 268, 337, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets
STEPPER_WIDGETS (1, 268, 337, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets
STEPPER_WIDGETS (1, 268, 337, 99, 110, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 268, 337, 48, 59, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 268, 337, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 268, 337, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 268, 337, 99, 110, STR_NONE, STR_NONE ), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 8, 371, 116, 127, STR_GUESTS_PREFER_LESS_INTENSE_RIDES, STR_GUESTS_PREFER_LESS_INTENSE_RIDES_TIP },
{ WWT_CHECKBOX, 1, 8, 371, 133, 144, STR_GUESTS_PREFER_MORE_INTENSE_RIDES, STR_GUESTS_PREFER_MORE_INTENSE_RIDES_TIP },
{ WIDGETS_END }
@ -142,11 +142,11 @@ static rct_widget window_editor_scenario_options_park_widgets[] = {
{ WWT_TAB, 1, 34, 64, 17, 46, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_GUESTS_TIP },
{ WWT_TAB, 1, 65, 95, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SCENARIO_OPTIONS_PARK_TIP },
STEPPER_WIDGETS (1, 188, 257, 48, 59, STR_NONE, STR_NONE ), // NB: 3 widgets
STEPPER_WIDGETS (1, 188, 257, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 188, 257, 48, 59, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 188, 257, 65, 76, STR_NONE, STR_NONE ), // NB: 3 widgets
{ WWT_DROPDOWN, 1, 8, 217, 82, 93, STR_NONE, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP },
{ WWT_BUTTON, 1, 206, 216, 83, 92, STR_DROPDOWN_GLYPH, STR_PAY_FOR_PARK_PAY_FOR_RIDES_TIP },
STEPPER_WIDGETS (1, 328, 397, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets
SPINNER_WIDGETS (1, 328, 397, 82, 93, STR_NONE, STR_NONE ), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 8, 391, 99, 110, STR_FORBID_TREE_REMOVAL, STR_FORBID_TREE_REMOVAL_TIP },
{ WWT_CHECKBOX, 1, 8, 391, 116, 127, STR_FORBID_LANDSCAPE_CHANGES, STR_FORBID_LANDSCAPE_CHANGES_TIP },
{ WWT_CHECKBOX, 1, 8, 391, 133, 144, STR_FORBID_HIGH_CONSTRUCTION, STR_FORBID_HIGH_CONSTRUCTION_TIP },
@ -721,16 +721,16 @@ static void window_editor_scenario_options_financial_invalidate(rct_window *w)
w->widgets[i].type = WWT_EMPTY;
} else {
w->pressed_widgets &= ~(1 << WIDX_NO_MONEY);
w->widgets[WIDX_INITIAL_CASH].type = WWT_STEPPER;
w->widgets[WIDX_INITIAL_CASH].type = WWT_SPINNER;
w->widgets[WIDX_INITIAL_CASH_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_INITIAL_CASH_DECREASE].type = WWT_BUTTON;
w->widgets[WIDX_INITIAL_LOAN].type = WWT_STEPPER;
w->widgets[WIDX_INITIAL_LOAN].type = WWT_SPINNER;
w->widgets[WIDX_INITIAL_LOAN_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_INITIAL_LOAN_DECREASE].type = WWT_BUTTON;
w->widgets[WIDX_MAXIMUM_LOAN].type = WWT_STEPPER;
w->widgets[WIDX_MAXIMUM_LOAN].type = WWT_SPINNER;
w->widgets[WIDX_MAXIMUM_LOAN_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_MAXIMUM_LOAN_DECREASE].type = WWT_BUTTON;
w->widgets[WIDX_INTEREST_RATE].type = WWT_STEPPER;
w->widgets[WIDX_INTEREST_RATE].type = WWT_SPINNER;
w->widgets[WIDX_INTEREST_RATE_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_INTEREST_RATE_DECREASE].type = WWT_BUTTON;
w->widgets[WIDX_FORBID_MARKETING].type = WWT_CHECKBOX;
@ -1026,7 +1026,7 @@ static void window_editor_scenario_options_guests_invalidate(rct_window *w)
w->widgets[WIDX_CASH_PER_GUEST_INCREASE].type = WWT_EMPTY;
w->widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WWT_EMPTY;
} else {
w->widgets[WIDX_CASH_PER_GUEST].type = WWT_STEPPER;
w->widgets[WIDX_CASH_PER_GUEST].type = WWT_SPINNER;
w->widgets[WIDX_CASH_PER_GUEST_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_CASH_PER_GUEST_DECREASE].type = WWT_BUTTON;
}
@ -1388,10 +1388,10 @@ static void window_editor_scenario_options_park_invalidate(rct_window *w)
}
else
{
w->widgets[WIDX_LAND_COST].type = WWT_STEPPER;
w->widgets[WIDX_LAND_COST].type = WWT_SPINNER;
w->widgets[WIDX_LAND_COST_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_LAND_COST_DECREASE].type = WWT_BUTTON;
w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].type = WWT_STEPPER;
w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST].type = WWT_SPINNER;
w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_CONSTRUCTION_RIGHTS_COST_DECREASE].type = WWT_BUTTON;
w->widgets[WIDX_PAY_FOR_PARK_OR_RIDES].type = WWT_DROPDOWN;
@ -1405,7 +1405,7 @@ static void window_editor_scenario_options_park_invalidate(rct_window *w)
}
else
{
w->widgets[WIDX_ENTRY_PRICE].type = WWT_STEPPER;
w->widgets[WIDX_ENTRY_PRICE].type = WWT_SPINNER;
w->widgets[WIDX_ENTRY_PRICE_INCREASE].type = WWT_BUTTON;
w->widgets[WIDX_ENTRY_PRICE_DECREASE].type = WWT_BUTTON;
}

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

@ -101,7 +101,7 @@ static rct_widget _windowFinancesSummaryWidgets[] =
{ WWT_RESIZE, 1, 0, 529, 43, 309, 0xFFFFFFFF, STR_NONE }, \
TAB_WIDGETS,
{ WWT_SCROLL, 1, 130, 520, 50, 260, SCROLL_HORIZONTAL, STR_NONE },
STEPPER_WIDGETS (1, 64, 153, 279, 290, STR_FINANCES_SUMMARY_LOAN_VALUE, STR_NONE), // NB: 3 widgets.
SPINNER_WIDGETS (1, 64, 153, 279, 290, STR_FINANCES_SUMMARY_LOAN_VALUE, STR_NONE), // NB: 3 widgets.
{ WIDGETS_END },
};

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

@ -87,7 +87,7 @@ static rct_widget window_map_widgets[] = {
{ WWT_COLOURBTN, 1, 3, 33, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_PEOPLE_ON_MAP_TIP },
{ WWT_COLOURBTN, 1, 34, 64, 17, 43, IMAGE_TYPE_REMAP | SPR_TAB, STR_SHOW_RIDES_STALLS_ON_MAP_TIP },
{ WWT_SCROLL, 1, 3, 241, 46, 225, SCROLL_BOTH, STR_NONE },
STEPPER_WIDGETS (1, 104, 198, 229, 240, STR_MAP_SIZE_VALUE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 104, 198, 229, 240, STR_MAP_SIZE_VALUE, STR_NONE), // NB: 3 widgets
{ WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_BUY_LAND_RIGHTS, STR_SELECT_PARK_OWNED_LAND_TIP },
{ WWT_FLATBTN, 1, 4, 27, 1, 24, SPR_PARK_ENTRANCE, STR_BUILD_PARK_ENTRANCE_TIP },
{ WWT_FLATBTN, 1, 28, 51, 1, 24, (uint32) SPR_NONE, STR_SET_STARTING_POSITIONS_TIP },
@ -984,7 +984,7 @@ static void window_map_centre_on_view_point()
static void window_map_show_default_scenario_editor_buttons(rct_window *w) {
w->widgets[WIDX_BUILD_PARK_ENTRANCE].type = WWT_FLATBTN;
w->widgets[WIDX_PEOPLE_STARTING_POSITION].type = WWT_FLATBTN;
w->widgets[WIDX_MAP_SIZE_SPINNER].type = WWT_STEPPER;
w->widgets[WIDX_MAP_SIZE_SPINNER].type = WWT_SPINNER;
w->widgets[WIDX_MAP_SIZE_SPINNER_UP].type = WWT_BUTTON;
w->widgets[WIDX_MAP_SIZE_SPINNER_DOWN].type = WWT_BUTTON;

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

@ -129,9 +129,9 @@ enum {
static rct_widget MapWidgets[] = {
SHARED_WIDGETS,
{ WWT_BUTTON, 1, WW - 95, WW - 6, WH - 17, WH - 6, STR_MAPGEN_ACTION_GENERATE, STR_NONE },
STEPPER_WIDGETS (1, 104, 198, 52, 63, STR_NONE, STR_NONE), // NB: 3 widgets
STEPPER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // NB: 3 widgets
STEPPER_WIDGETS (1, 104, 198, 88, 99, STR_NONE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 104, 198, 52, 63, STR_NONE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 104, 198, 88, 99, STR_NONE, STR_NONE), // NB: 3 widgets
{ WWT_FLATBTN, 1, 104, 150, 106, 141, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP },
{ WWT_FLATBTN, 1, 151, 197, 106, 141, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP },
{ WIDGETS_END },
@ -149,12 +149,12 @@ static rct_widget SimplexWidgets[] = {
SHARED_WIDGETS,
{ WWT_BUTTON, 1, WW - 95, WW - 6, WH - 17, WH - 6, STR_MAPGEN_ACTION_GENERATE, STR_NONE }, // WIDX_SIMPLEX_GENERATE
{ WWT_LABEL_CENTRED, 1, 4, 198, 52, 63, STR_MAPGEN_SIMPLEX_NOISE, STR_NONE }, // WIDX_SIMPLEX_LABEL
STEPPER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // WIDX_SIMPLEX_LOW{,_UP,_DOWN}
STEPPER_WIDGETS (1, 104, 198, 88, 99, STR_NONE, STR_NONE), // WIDX_SIMPLEX_HIGH{,_UP,_DOWN}
STEPPER_WIDGETS (1, 104, 198, 106, 117, STR_NONE, STR_NONE), // WIDX_SIMPLEX_BASE_FREQ{,_UP,_DOWN}
STEPPER_WIDGETS (1, 104, 198, 124, 135, STR_NONE, STR_NONE), // WIDX_SIMPLEX_OCTAVES{,_UP,_DOWN}
STEPPER_WIDGETS (1, 104, 198, 148, 159, STR_NONE, STR_NONE), // WIDX_SIMPLEX_MAP_SIZE{,_UP,_DOWN}
STEPPER_WIDGETS (1, 104, 198, 166, 177, STR_NONE, STR_NONE), // WIDX_SIMPLEX_WATER_LEVEL{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // WIDX_SIMPLEX_LOW{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 88, 99, STR_NONE, STR_NONE), // WIDX_SIMPLEX_HIGH{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 106, 117, STR_NONE, STR_NONE), // WIDX_SIMPLEX_BASE_FREQ{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 124, 135, STR_NONE, STR_NONE), // WIDX_SIMPLEX_OCTAVES{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 148, 159, STR_NONE, STR_NONE), // WIDX_SIMPLEX_MAP_SIZE{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 166, 177, STR_NONE, STR_NONE), // WIDX_SIMPLEX_WATER_LEVEL{,_UP,_DOWN}
{ WWT_CHECKBOX, 1, 104, 198, 190, 201, STR_MAPGEN_OPTION_RANDOM_TERRAIN, STR_NONE }, // WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX
{ WWT_FLATBTN, 1, 102, 148, 202, 237, 0xFFFFFFFF, STR_CHANGE_BASE_LAND_TIP }, // WIDX_SIMPLEX_FLOOR_TEXTURE
{ WWT_FLATBTN, 1, 150, 196, 202, 237, 0xFFFFFFFF, STR_CHANGE_VERTICAL_LAND_TIP }, // WIDX_SIMPLEX_WALL_TEXTURE
@ -166,12 +166,12 @@ static rct_widget HeightmapWidgets[] = {
SHARED_WIDGETS,
{ WWT_BUTTON, 1, WW - 155, WW - 6, WH - 17, WH - 6, STR_MAPGEN_SELECT_HEIGHTMAP, STR_NONE }, // WIDX_HEIGHTMAP_SELECT
{ WWT_CHECKBOX, 1, 4, 103, 52, 63, STR_MAPGEN_SMOOTH_HEIGHTMAP,STR_NONE }, // WIDX_HEIGHTMAP_SMOOTH_HEIGHTMAP
STEPPER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_STRENGTH{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 70, 81, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_STRENGTH{,_UP,_DOWN}
{ WWT_CHECKBOX, 1, 4, 103, 88, 99, STR_MAPGEN_NORMALIZE, STR_NONE }, // WIDX_HEIGHTMAP_NORMALIZE
{ WWT_CHECKBOX, 1, 4, 103, 106, 117, STR_MAPGEN_SMOOTH_TILE, STR_NONE }, // WIDX_HEIGHTMAP_SMOOTH_TILES
STEPPER_WIDGETS (1, 104, 198, 124, 135, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN}
STEPPER_WIDGETS (1, 104, 198, 142, 153, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN}
STEPPER_WIDGETS (1, 104, 198, 160, 171, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_WATER_LEVEL{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 124, 135, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_LOW{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 142, 153, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_HIGH{,_UP,_DOWN}
SPINNER_WIDGETS (1, 104, 198, 160, 171, STR_NONE, STR_NONE), // WIDX_HEIGHTMAP_WATER_LEVEL{,_UP,_DOWN}
{ WIDGETS_END },
};

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

@ -52,7 +52,7 @@ static rct_widget window_new_campaign_widgets[] = {
{ WWT_DROPDOWN, 0, 100, 341, 24, 35, 0, STR_NONE }, // ride dropdown
{ WWT_BUTTON, 0, 330, 340, 25, 34, STR_DROPDOWN_GLYPH, STR_NONE }, // ride dropdown button
{ WWT_LABEL, 0, 14, 139, 41, 52, STR_LENGTH_OF_TIME, STR_NONE }, // weeks label
STEPPER_WIDGETS (0, 120, 219, 41, 52, 0, STR_NONE), // weeks (3 widgets)
SPINNER_WIDGETS (0, 120, 219, 41, 52, 0, STR_NONE), // weeks (3 widgets)
{ WWT_BUTTON, 0, 14, 335, 89, 100, STR_MARKETING_START_THIS_MARKETING_CAMPAIGN, STR_NONE }, // start button
{ WIDGETS_END }
};

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

@ -229,7 +229,7 @@ static rct_widget window_options_display_widgets[] = {
{ WWT_BUTTON, 1, 288, 298, 69, 78, STR_DROPDOWN_GLYPH, STR_FULLSCREEN_MODE_TIP },
{ WWT_DROPDOWN, 1, 155, 299, 83, 94, STR_ARG_16_RESOLUTION_X_BY_Y, STR_NONE }, // Resolution
{ WWT_BUTTON, 1, 288, 298, 84, 93, STR_DROPDOWN_GLYPH, STR_DISPLAY_RESOLUTION_TIP },
STEPPER_WIDGETS (1, 155, 299, 98, 109, STR_NONE, STR_WINDOW_SCALE_TIP), // Scale spinner (3 widgets)
SPINNER_WIDGETS (1, 155, 299, 98, 109, STR_NONE, STR_WINDOW_SCALE_TIP), // Scale spinner (3 widgets)
{ WWT_DROPDOWN, 1, 155, 299, 113, 124, STR_NONE, STR_NONE },
{ WWT_BUTTON, 1, 288, 298, 114, 123, STR_DROPDOWN_GLYPH, STR_DRAWING_ENGINE_TIP },
{ WWT_DROPDOWN, 1, 155, 299, 128, 139, STR_NONE, STR_NONE }, // Scaling quality hint

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

@ -119,7 +119,7 @@ static rct_widget window_park_guests_widgets[] = {
static rct_widget window_park_price_widgets[] = {
MAIN_PARK_WIDGETS,
{ WWT_LABEL, 1, 21, 146, 50, 61, STR_ADMISSION_PRICE, STR_NONE }, //
STEPPER_WIDGETS (1, 147, 222, 50, 61, STR_ARG_6_CURRENCY2DP, STR_NONE), // Price (3 widgets)
SPINNER_WIDGETS (1, 147, 222, 50, 61, STR_ARG_6_CURRENCY2DP, STR_NONE), // Price (3 widgets)
{ WIDGETS_END },
};
@ -1267,7 +1267,7 @@ static void window_park_price_invalidate(rct_window *w)
}
else
{
window_park_price_widgets[WIDX_PRICE].type = WWT_STEPPER;
window_park_price_widgets[WIDX_PRICE].type = WWT_SPINNER;
window_park_price_widgets[WIDX_INCREASE_PRICE].type = WWT_BUTTON;
window_park_price_widgets[WIDX_DECREASE_PRICE].type = WWT_BUTTON;
}

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

@ -241,22 +241,22 @@ static rct_widget window_ride_vehicle_widgets[] = {
{ WWT_DROPDOWN, 1, 7, 308, 50, 61, 0xFFFFFFFF, STR_NONE },
{ WWT_BUTTON, 1, 297, 307, 51, 60, STR_DROPDOWN_GLYPH, STR_NONE },
{ WWT_SCROLL, 1, 7, 308, 147, 189, 0, STR_NONE },
STEPPER_WIDGETS (1, 7, 151, 196, 207, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP),
STEPPER_WIDGETS (1, 164, 308, 196, 207, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP),
SPINNER_WIDGETS (1, 7, 151, 196, 207, STR_RIDE_VEHICLE_COUNT, STR_MAX_VEHICLES_TIP),
SPINNER_WIDGETS (1, 164, 308, 196, 207, STR_1_CAR_PER_TRAIN, STR_MAX_CARS_PER_TRAIN_TIP),
{ WIDGETS_END },
};
// 0x009ADEFC
static rct_widget window_ride_operating_widgets[] = {
MAIN_RIDE_WIDGETS,
STEPPER_WIDGETS (1, 157, 308, 61, 72, STR_ARG_18_STRINGID, STR_NONE), // NB: 3 widgets
STEPPER_WIDGETS (1, 157, 308, 75, 86, STR_LIFT_HILL_CHAIN_SPEED_VALUE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 157, 308, 61, 72, STR_ARG_18_STRINGID, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 157, 308, 75, 86, STR_LIFT_HILL_CHAIN_SPEED_VALUE, STR_NONE), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 7, 86, 109, 120, STR_WAIT_FOR, STR_WAIT_FOR_PASSENGERS_BEFORE_DEPARTING_TIP },
{ WWT_CHECKBOX, 1, 7, 308, 124, 135, 0xFFFFFFFF, STR_NONE },
{ WWT_CHECKBOX, 1, 7, 156, 139, 150, STR_MINIMUM_WAITING_TIME, STR_MINIMUM_LENGTH_BEFORE_DEPARTING_TIP },
STEPPER_WIDGETS (1, 157, 308, 139, 150, STR_ARG_10_STRINGID, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 157, 308, 139, 150, STR_ARG_10_STRINGID, STR_NONE), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 7, 156, 154, 165, STR_MAXIMUM_WAITING_TIME, STR_MAXIMUM_LENGTH_BEFORE_DEPARTING_TIP },
STEPPER_WIDGETS (1, 157, 308, 154, 165, STR_ARG_14_STRINGID, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 157, 308, 154, 165, STR_ARG_14_STRINGID, STR_NONE), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 7, 308, 169, 180, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS, STR_SYNCHRONISE_WITH_ADJACENT_STATIONS_TIP },
{ WWT_LABEL, 1, 21, 149, 61, 72, 0xFFFFFFFF, STR_NONE },
{ WWT_LABEL, 1, 21, 149, 75, 86, STR_LIFT_HILL_CHAIN_SPEED, STR_NONE },
@ -265,7 +265,7 @@ static rct_widget window_ride_operating_widgets[] = {
{ WWT_DROPDOWN, 1, 87, 308, 109, 120, 0xFFFFFFFF, STR_NONE },
{ WWT_BUTTON, 1, 297, 307, 110, 119, STR_DROPDOWN_GLYPH, STR_NONE },
{ WWT_LABEL, 1, 21, 149, 89, 100, STR_NUMBER_OF_CIRCUITS, STR_NUMBER_OF_CIRCUITS_TIP },
STEPPER_WIDGETS (1, 157, 308, 89, 100, STR_NUMBER_OF_CIRCUITS_VALUE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 157, 308, 89, 100, STR_NUMBER_OF_CIRCUITS_VALUE, STR_NONE), // NB: 3 widgets
{ WIDGETS_END },
};
@ -283,7 +283,7 @@ static rct_widget window_ride_maintenance_widgets[] = {
// 0x009AE2A4
static rct_widget window_ride_colour_widgets[] = {
MAIN_RIDE_WIDGETS,
{ WWT_STEPPER, 1, 3, 70, 47, 93, 0xFFFFFFFF, STR_NONE },
{ WWT_SPINNER, 1, 3, 70, 47, 93, 0xFFFFFFFF, STR_NONE },
{ WWT_DROPDOWN, 1, 74, 312, 49, 60, STR_ARG_14_STRINGID, STR_NONE },
{ WWT_BUTTON, 1, 301, 311, 50, 59, STR_DROPDOWN_GLYPH, STR_COLOUR_SCHEME_TO_CHANGE_TIP },
{ WWT_COLOURBTN, 1, 79, 90, 74, 85, 0xFFFFFFFF, STR_SELECT_MAIN_COLOUR_TIP },
@ -292,7 +292,7 @@ static rct_widget window_ride_colour_widgets[] = {
{ WWT_DROPDOWN, 1, 74, 312, 49, 60, 0xFFFFFFFF, STR_NONE },
{ WWT_BUTTON, 1, 301, 311, 50, 59, STR_DROPDOWN_GLYPH, STR_NONE },
{ WWT_FLATBTN, 1, 289, 312, 68, 91, SPR_PAINTBRUSH, STR_PAINT_INDIVIDUAL_AREA_TIP },
{ WWT_STEPPER, 1, 245, 312, 101, 147, 0xFFFFFFFF, STR_NONE },
{ WWT_SPINNER, 1, 245, 312, 101, 147, 0xFFFFFFFF, STR_NONE },
{ WWT_DROPDOWN, 1, 3, 241, 103, 114, 0, STR_NONE },
{ WWT_BUTTON, 1, 230, 240, 104, 113, STR_DROPDOWN_GLYPH, STR_SELECT_STYLE_OF_ENTRANCE_EXIT_STATION_TIP },
{ WWT_SCROLL, 1, 3, 70, 157, 203, 0, STR_NONE },
@ -341,10 +341,10 @@ static rct_widget window_ride_graphs_widgets[] = {
static rct_widget window_ride_income_widgets[] = {
MAIN_RIDE_WIDGETS,
{ WWT_LABEL, 1, 19, 144, 50, 61, 0xFFFFFFFF, STR_NONE },
STEPPER_WIDGETS (1, 147, 308, 50, 61, STR_ARG_6_CURRENCY2DP, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 147, 308, 50, 61, STR_ARG_6_CURRENCY2DP, STR_NONE), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 5, 310, 62, 74, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP },
{ WWT_LABEL, 1, 19, 144, 94, 105, 0xFFFFFFFF, STR_NONE },
STEPPER_WIDGETS (1, 147, 308, 94, 105, STR_RIDE_SECONDARY_PRICE_VALUE, STR_NONE), // NB: 3 widgets
SPINNER_WIDGETS (1, 147, 308, 94, 105, STR_RIDE_SECONDARY_PRICE_VALUE, STR_NONE), // NB: 3 widgets
{ WWT_CHECKBOX, 1, 5, 310, 106, 118, STR_SAME_PRICE_THROUGHOUT_PARK, STR_SAME_PRICE_THROUGHOUT_PARK_TIP },
{ WIDGETS_END },
};
@ -2895,7 +2895,7 @@ static void window_ride_vehicle_invalidate(rct_window *w)
// Trains
if (rideEntry->cars_per_flat_ride > 1 || gCheatsDisableTrainLengthLimit) {
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS].type = WWT_STEPPER;
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS].type = WWT_SPINNER;
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_INCREASE].type = WWT_BUTTON;
window_ride_vehicle_widgets[WIDX_VEHICLE_TRAINS_DECREASE].type = WWT_BUTTON;
@ -2907,7 +2907,7 @@ static void window_ride_vehicle_invalidate(rct_window *w)
// Cars per train
if (rideEntry->zero_cars + 1 < rideEntry->max_cars_in_train||gCheatsDisableTrainLengthLimit) {
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WWT_STEPPER;
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN].type = WWT_SPINNER;
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE].type = WWT_BUTTON;
window_ride_vehicle_widgets[WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE].type = WWT_BUTTON;
} else {
@ -3453,7 +3453,7 @@ static void window_ride_operating_invalidate(rct_window *w)
if (track_piece_is_available_for_ride_type(ride->type, TRACK_LIFT_HILL))
{
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WWT_LABEL;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED].type = WWT_STEPPER;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED].type = WWT_SPINNER;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WWT_BUTTON;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_DECREASE].type = WWT_BUTTON;
set_format_arg(20, uint16, ride->lift_hill_speed);
@ -3467,7 +3467,7 @@ static void window_ride_operating_invalidate(rct_window *w)
// Number of circuits
if (ride_can_have_multiple_circuits(ride)) {
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_LABEL].type = WWT_LABEL;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WWT_STEPPER;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS].type = WWT_SPINNER;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE].type = WWT_BUTTON;
window_ride_operating_widgets[WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE].type = WWT_BUTTON;
set_format_arg(22, uint16, ride->num_circuits);
@ -3514,12 +3514,12 @@ static void window_ride_operating_invalidate(rct_window *w)
window_ride_operating_widgets[WIDX_LOAD_DROPDOWN].type = WWT_BUTTON;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_CHECKBOX].type = WWT_CHECKBOX;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH].type = WWT_STEPPER;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH].type = WWT_SPINNER;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_INCREASE].type = WWT_BUTTON;
window_ride_operating_widgets[WIDX_MINIMUM_LENGTH_DECREASE].type = WWT_BUTTON;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_CHECKBOX].type = WWT_CHECKBOX;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH].type = WWT_STEPPER;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH].type = WWT_SPINNER;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_INCREASE].type = WWT_BUTTON;
window_ride_operating_widgets[WIDX_MAXIMUM_LENGTH_DECREASE].type = WWT_BUTTON;
@ -3615,7 +3615,7 @@ static void window_ride_operating_invalidate(rct_window *w)
window_ride_operating_widgets[WIDX_MODE_TWEAK_LABEL].type = WWT_LABEL;
window_ride_operating_widgets[WIDX_MODE_TWEAK_LABEL].text = caption;
window_ride_operating_widgets[WIDX_MODE_TWEAK_LABEL].tooltip = tooltip;
window_ride_operating_widgets[WIDX_MODE_TWEAK].type = WWT_STEPPER;
window_ride_operating_widgets[WIDX_MODE_TWEAK].type = WWT_SPINNER;
window_ride_operating_widgets[WIDX_MODE_TWEAK].text = format;
window_ride_operating_widgets[WIDX_MODE_TWEAK_INCREASE].type = WWT_BUTTON;
window_ride_operating_widgets[WIDX_MODE_TWEAK_DECREASE].type = WWT_BUTTON;
@ -4542,13 +4542,13 @@ static void window_ride_colour_invalidate(rct_window *w)
// Track preview
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_ADDITIONAL | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS))
window_ride_colour_widgets[WIDX_TRACK_PREVIEW].type = WWT_STEPPER;
window_ride_colour_widgets[WIDX_TRACK_PREVIEW].type = WWT_SPINNER;
else
window_ride_colour_widgets[WIDX_TRACK_PREVIEW].type = WWT_EMPTY;
// Entrance style
if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT) {
window_ride_colour_widgets[WIDX_ENTRANCE_PREVIEW].type = WWT_STEPPER;
window_ride_colour_widgets[WIDX_ENTRANCE_PREVIEW].type = WWT_SPINNER;
window_ride_colour_widgets[WIDX_ENTRANCE_STYLE].type = WWT_DROPDOWN;
window_ride_colour_widgets[WIDX_ENTRANCE_STYLE_DROPDOWN].type = WWT_BUTTON;
@ -6172,7 +6172,7 @@ static void window_ride_income_invalidate(rct_window *w)
// Show widgets
window_ride_income_widgets[WIDX_SECONDARY_PRICE_LABEL].type = WWT_LABEL;
window_ride_income_widgets[WIDX_SECONDARY_PRICE].type = WWT_STEPPER;
window_ride_income_widgets[WIDX_SECONDARY_PRICE].type = WWT_SPINNER;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_INCREASE].type = WWT_BUTTON;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_DECREASE].type = WWT_BUTTON;
window_ride_income_widgets[WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK].type = WWT_CHECKBOX;

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

@ -127,7 +127,7 @@ static rct_widget window_ride_construction_widgets[] = {
{ WWT_FLATBTN, 1, 19, 42, 132, 155, SPR_RIDE_CONSTRUCTION_U_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_U_SHAPED_OPEN_TRACK_TIP },
{ WWT_FLATBTN, 1, 123, 146, 132, 155, SPR_RIDE_CONSTRUCTION_O_SHAPED_TRACK, STR_RIDE_CONSTRUCTION_O_SHAPED_ENCLOSED_TRACK_TIP },
{ WWT_GROUPBOX, 0, 96, 162, 120, 160, STR_RIDE_CONSTRUCTION_SEAT_ROT, STR_NONE },
STEPPER_WIDGETS (1, 101, 158, 138, 149, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP),
SPINNER_WIDGETS (1, 101, 158, 138, 149, 0, STR_RIDE_CONSTRUCTION_SELECT_SEAT_ROTATION_ANGLE_TIP),
{ WIDGETS_END }
};
@ -2962,7 +2962,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
_currentlyShowingBrakeOrBoosterSpeed = true;
window_ride_construction_widgets[WIDX_BANK_LEFT].text = STR_RIDE_CONSTRUCTION_BRAKE_SPEED_VELOCITY;
window_ride_construction_widgets[WIDX_BANK_LEFT].type = WWT_STEPPER;
window_ride_construction_widgets[WIDX_BANK_LEFT].type = WWT_SPINNER;
window_ride_construction_widgets[WIDX_BANK_LEFT].left = 12;
window_ride_construction_widgets[WIDX_BANK_LEFT].right = 96;
window_ride_construction_widgets[WIDX_BANK_LEFT].top = 138;
@ -2993,11 +2993,11 @@ static void window_ride_construction_update_widgets(rct_window *w)
_currentTrackCurve != (0x100 | TRACK_ELEM_BRAKES)
) {
window_ride_construction_widgets[WIDX_SEAT_ROTATION_GROUPBOX].type = WWT_GROUPBOX;
window_ride_construction_widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER].type = WWT_STEPPER;
window_ride_construction_widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER].type = WWT_SPINNER;
window_ride_construction_widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_UP].type = WWT_BUTTON;
window_ride_construction_widgets[WIDX_SEAT_ROTATION_ANGLE_SPINNER_DOWN].type = WWT_BUTTON;
window_ride_construction_widgets[WIDX_BANKING_GROUPBOX].right = 92;
if (window_ride_construction_widgets[WIDX_BANK_LEFT].type != WWT_STEPPER) {
if (window_ride_construction_widgets[WIDX_BANK_LEFT].type != WWT_SPINNER) {
for (sint32 i = WIDX_BANK_LEFT; i <= WIDX_BANK_RIGHT; i++) {
window_ride_construction_widgets[i].left -= 36;
window_ride_construction_widgets[i].right -= 36;

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

@ -63,7 +63,7 @@ static rct_widget window_server_start_widgets[] = {
{ WWT_TEXT_BOX, 1, 120, WW-8, 52, 64, STR_NONE, STR_NONE }, // description text box
{ WWT_TEXT_BOX, 1, 120, WW-8, 68, 80, STR_NONE, STR_NONE }, // greeting text box
{ WWT_TEXT_BOX, 1, 120, WW-8, 84, 96, STR_NONE, STR_NONE }, // password text box
STEPPER_WIDGETS (1, 120, WW-8, 100, 111, STR_SERVER_MAX_PLAYERS_VALUE, STR_NONE), // max players (3 widgets)
SPINNER_WIDGETS (1, 120, WW-8, 100, 111, STR_SERVER_MAX_PLAYERS_VALUE, STR_NONE), // max players (3 widgets)
{ WWT_CHECKBOX, 1, 6, WW-8, 117, 130, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP }, // advertise checkbox
{ WWT_BUTTON, 1, 6, 106, WH-6-13, WH-6, STR_NEW_GAME, STR_NONE }, // start server button
{ WWT_BUTTON, 1, 112, 212, WH-6-13, WH-6, STR_LOAD_GAME, STR_NONE },

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

@ -256,8 +256,8 @@ enum WINDOW_TILE_INSPECTOR_WIDGET_IDX {
{ WWT_CAPTION, 0, 1, WW - 2, 1, 14, STR_TILE_INSPECTOR_TITLE, STR_WINDOW_TITLE_TIP }, /* title bar */ \
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, /* close x button */ \
{ WWT_SCROLL, 1, 3, WW - 4, 57, WH - PADDING_BOTTOM, 2, STR_NONE }, /* Element list */ \
STEPPER_WIDGETS (1, 20, 70, 23, 34, STR_NONE, STR_NONE), /* Spinner X (3 widgets) */ \
STEPPER_WIDGETS (1, 90, 140, 23, 34, STR_NONE, STR_NONE), /* Spinner Y (3 widgets) */ \
SPINNER_WIDGETS (1, 20, 70, 23, 34, STR_NONE, STR_NONE), /* Spinner X (3 widgets) */ \
SPINNER_WIDGETS (1, 90, 140, 23, 34, STR_NONE, STR_NONE), /* Spinner Y (3 widgets) */ \
/* Buttons */ \
{ WWT_FLATBTN, 1, BX, BW, BY, BH, SPR_MAP, STR_INSERT_CORRUPT_TIP }, /* Insert corrupt button */ \
{ WWT_FLATBTN, 1, BX - BS * 1, BW - BS * 1, BY, BH, SPR_DEMOLISH, STR_REMOVE_SELECTED_ELEMENT_TIP }, /* Remove button */ \
@ -289,7 +289,7 @@ static rct_widget DefaultWidgets[] = {
#define SUR_GBDT (SUR_GBDB + 20 + 4 * 11) // Surface group box details top
static rct_widget SurfaceWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - SUR_GBPT, 0) + 3, GBBB(WH - SUR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_SURFACE_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - SUR_GBPT, 0) + 3, GBBB(WH - SUR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_SURFACE_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_BUTTON, 1, GBB(WH - SUR_GBPT, 0, 1), STR_TILE_INSPECTOR_SURFACE_REMOVE_FENCES, STR_NONE }, // WIDX_SURFACE_BUTTON_REMOVE_FENCES
{ WWT_BUTTON, 1, GBB(WH - SUR_GBPT, 1, 1), STR_TILE_INSPECTOR_SURFACE_RESTORE_FENCES, STR_NONE }, // WIDX_SURFACE_BUTTON_RESTORE_FENCES
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - SUR_GBPT, 2) + 7 * 0), STR_NONE, STR_NONE }, // WIDX_SURFACE_CHECK_CORNER_N
@ -306,7 +306,7 @@ static rct_widget SurfaceWidgets[] = {
#define PAT_GBDT (PAT_GBDB + 20 + 2 * 11) // Path group box info top
static rct_widget PathWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - PAT_GBPT, 0) + 3, GBBB(WH - PAT_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_PATH_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - PAT_GBPT, 0) + 3, GBBB(WH - PAT_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_PATH_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_CHECKBOX, 1, GBBF(WH - PAT_GBPT, 0, 1), STR_TILE_INSPECTOR_PATH_SLOPED, STR_NONE }, // WIDX_PATH_CHECK_SLOPED
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 3, GBBT(WH - PAT_GBPT, 2) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_PATH_CHECK_EDGE_NE
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 4, GBBT(WH - PAT_GBPT, 2) + 7 * 2), STR_NONE, STR_NONE }, // WIDX_PATH_CHECK_EDGE_E
@ -326,7 +326,7 @@ static rct_widget PathWidgets[] = {
static rct_widget TrackWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
{ WWT_CHECKBOX, 1, GBBF(WH - TRA_GBPT, 0, 0), STR_TILE_INSPECTOR_TRACK_ENTIRE_TRACK_PIECE, STR_NONE }, // WIDX_TRACK_CHECK_APPLY_TO_ALL
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - TRA_GBPT, 1) + 3, GBBB(WH - TRA_GBPT, 1) - 3, STR_NONE, STR_NONE), // WIDX_TRACK_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - TRA_GBPT, 1) + 3, GBBB(WH - TRA_GBPT, 1) - 3, STR_NONE, STR_NONE), // WIDX_TRACK_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_CHECKBOX, 1, GBBF(WH - TRA_GBPT, 0, 2), STR_TILE_INSPECTOR_TRACK_CHAIN_LIFT, STR_NONE }, // WIDX_TRACK_CHECK_CHAIN_LIFT
{ WIDGETS_END },
};
@ -337,7 +337,7 @@ static rct_widget TrackWidgets[] = {
#define SCE_GBDT (SCE_GBDB + 20 + 3 * 11) // Scenery group box info top
static rct_widget SceneryWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - SCE_GBPT, 0) + 3, GBBB(WH - SCE_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - SCE_GBPT, 0) + 3, GBBB(WH - SCE_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - SCE_GBPT, 1) + 7 * 0), STR_NONE, STR_NONE }, // WIDX_SCENERY_CHECK_QUARTER_N
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 2, GBBT(WH - SCE_GBPT, 1) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_SCENERY_CHECK_QUARTER_E
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - SCE_GBPT, 1) + 7 * 2), STR_NONE, STR_NONE }, // WIDX_SCENERY_CHECK_QUARTER_S
@ -356,7 +356,7 @@ static rct_widget SceneryWidgets[] = {
#define ENT_GBDT (ENT_GBDB + 20 + 3 * 11) // Entrance group box info top
static rct_widget EntranceWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - ENT_GBPT, 0) + 3, GBBB(WH - ENT_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_ENTRANCE_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - ENT_GBPT, 0) + 3, GBBB(WH - ENT_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_ENTRANCE_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_BUTTON, 1, GBB(WH - ENT_GBPT, 0, 1), STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE, STR_TILE_INSPECTOR_ENTRANCE_MAKE_USABLE_TIP }, // WIDX_ENTRANCE_BUTTON_MAKE_USABLE
{ WIDGETS_END },
};
@ -367,7 +367,7 @@ static rct_widget EntranceWidgets[] = {
#define WALL_GBDT (WALL_GBDB + 20 + 2 * 11) // Wall group box info top
static rct_widget WallWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - WALL_GBPT, 0) + 3, GBBB(WH - WALL_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_WALL_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - WALL_GBPT, 0) + 3, GBBB(WH - WALL_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_WALL_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_DROPDOWN, 1, GBD(WH - WALL_GBPT, 1, 1), STR_NONE, STR_NONE }, // WIDX_WALL_DROPDOWN_SLOPE
{ WWT_BUTTON, 1, GBDB(WH - WALL_GBPT, 1, 1), STR_DROPDOWN_GLYPH, STR_NONE }, // WIDX_WALL_DROPDOWN_SLOPE_BUTTON
{ WIDGETS_END },
@ -379,7 +379,7 @@ static rct_widget WallWidgets[] = {
#define LAR_GBDT (LAR_GBDB + 20 + 3 * 11) // Large scenery group box info top
static rct_widget LargeSceneryWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - LAR_GBPT, 0) + 3, GBBB(WH - LAR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_LARGE_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - LAR_GBPT, 0) + 3, GBBB(WH - LAR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_LARGE_SCENERY_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WIDGETS_END },
};
@ -389,7 +389,7 @@ static rct_widget LargeSceneryWidgets[] = {
#define BAN_GBDT (BAN_GBDB + 20 + 1 * 11) // Banner group box info top
static rct_widget BannerWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - BAN_GBPT, 0) + 3, GBBB(WH - BAN_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_BANNER_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - BAN_GBPT, 0) + 3, GBBB(WH - BAN_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_BANNER_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 3, GBBT(WH - BAN_GBPT, 1) + 7 * 1), STR_NONE, STR_NONE }, // WIDX_BANNER_CHECK_BLOCK_NE
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 3, GBBT(WH - BAN_GBPT, 1) + 7 * 3), STR_NONE, STR_NONE }, // WIDX_BANNER_CHECK_BLOCK_SE
{ WWT_CHECKBOX, 1, CHK(GBBL(1) + 14 * 1, GBBT(WH - BAN_GBPT, 1) + 7 * 3), STR_NONE, STR_NONE }, // WIDX_BANNER_CHECK_BLOCK_SW
@ -404,7 +404,7 @@ static rct_widget BannerWidgets[] = {
#define COR_GBDT (COR_GBDB + 20 + 0 * 11) // Corrupt element group box info top
static rct_widget CorruptWidgets[] = {
MAIN_TILE_INSPECTOR_WIDGETS,
STEPPER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - COR_GBPT, 0) + 3, GBBB(WH - COR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_CORRUPT_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
SPINNER_WIDGETS (1, GBBL(1), GBBR(1), GBBT(WH - COR_GBPT, 0) + 3, GBBB(WH - COR_GBPT, 0) - 3, STR_NONE, STR_NONE), // WIDX_CORRUPT_SPINNER_HEIGHT{,_INCREASE,_DECREASE}
{ WWT_BUTTON, 1, GBB(WH - SUR_GBPT, 0, 1), STR_TILE_INSPECTOR_CLAMP_TO_NEXT, STR_TILE_INSPECTOR_CLAMP_TO_NEXT_TIP }, // WIDX_CORRUPT_BUTTON_CLAMP
{ WIDGETS_END },
};

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

@ -60,7 +60,7 @@ static rct_widget window_view_clipping_widgets[] = {
{ WWT_CLOSEBOX, 0, WW - 13, WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
{ WWT_CHECKBOX, 0, 11, WW - 11, 19, 29, STR_VIEW_CLIPPING_HEIGHT_ENABLE, STR_VIEW_CLIPPING_HEIGHT_ENABLE_TIP }, // clip enable/disable check box
{ WWT_GROUPBOX, 0, 5, WW - 6, 36, 83, STR_VIEW_CLIPPING_VERTICAL_CLIPPING, STR_NONE },
STEPPER_WIDGETS (0, 90, WW - 12, 51, 62, STR_NONE, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE), // clip height (3 widgets)
SPINNER_WIDGETS (0, 90, WW - 12, 51, 62, STR_NONE, STR_VIEW_CLIPPING_HEIGHT_VALUE_TOGGLE), // clip height (3 widgets)
{ WWT_SCROLL, 0, 11, WW - 12, 66, 78, SCROLL_HORIZONTAL, STR_VIEW_CLIPPING_HEIGHT_SCROLL_TIP }, // clip height scrollbar
{ WWT_GROUPBOX, 0, 5, WW - 6, 90, WH - 6, STR_VIEW_CLIPPING_HORIZONTAL_CLIPPING, STR_NONE },
{ WWT_BUTTON, 0, 11, WW - 12, 105, 121, STR_VIEW_CLIPPING_SELECT_AREA, STR_NONE }, // selector

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

@ -146,7 +146,7 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, rct_widgetindex widgetIn
case WWT_LABEL:
widget_text(dpi, w, widgetIndex);
break;
case WWT_STEPPER:
case WWT_SPINNER:
case WWT_DROPDOWN:
case WWT_VIEWPORT:
widget_text_inset(dpi, w, widgetIndex);

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

@ -32,7 +32,7 @@ enum WINDOW_WIDGET_TYPES {
WWT_LABEL_CENTRED = 12, // Centred text
WWT_TABLE_HEADER = 13, // Left-aligned textual button
WWT_LABEL = 14, // Left-aligned text
WWT_STEPPER = 15,
WWT_SPINNER = 15,
WWT_DROPDOWN = 16,
WWT_VIEWPORT = 17,
WWT_GROUPBOX = 19,
@ -48,12 +48,12 @@ enum WINDOW_WIDGET_TYPES {
#define WIDGETS_END WWT_LAST, 0, 0, 0, 0, 0, 0, 0
#define BAR_BLINK (1u << 31)
#define STEPPER_INCREASE(l, r, t, b) r - 12, r - 1, t + 1, b - 1
#define STEPPER_DECREASE(l, r, t, b) r - 25, r - 13, t + 1, b - 1
#define STEPPER_WIDGETS(colour, left, right, top, bottom, text, tooltip) \
{ WWT_STEPPER, colour, left, right, top, bottom, text, tooltip }, \
{ WWT_BUTTON, colour, STEPPER_INCREASE(left, right, top, bottom), STR_NUMERIC_UP, STR_NONE }, \
{ WWT_BUTTON, colour, STEPPER_DECREASE(left, right, top, bottom), STR_NUMERIC_DOWN, STR_NONE } \
#define SPINNER_INCREASE(l, r, t, b) r - 12, r - 1, t + 1, b - 1
#define SPINNER_DECREASE(l, r, t, b) r - 25, r - 13, t + 1, b - 1
#define SPINNER_WIDGETS(colour, left, right, top, bottom, text, tooltip) \
{ WWT_SPINNER, colour, left, right, top, bottom, text, tooltip }, \
{ WWT_BUTTON, colour, SPINNER_INCREASE(left, right, top, bottom), STR_NUMERIC_UP, STR_NONE }, \
{ WWT_BUTTON, colour, SPINNER_DECREASE(left, right, top, bottom), STR_NUMERIC_DOWN, STR_NONE } \
enum {
SCROLL_HORIZONTAL = (1 << 0),

8
src/openrct2/interface/Window.cpp
View File

@ -258,12 +258,12 @@ static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex,
// Lower widgetIndex once or twice we got a type that matches, to allow scrolling on the increase/decrease buttons too
sint32 attempts = 0;
while (widgetType != WWT_IMGBTN && widgetType != WWT_STEPPER && widgetIndex > 0)
while (widgetType != WWT_IMGBTN && widgetType != WWT_SPINNER && widgetIndex > 0)
{
switch (widgetType)
{
case WWT_TRNBTN: // + and - for preview widget
case WWT_BUTTON: // + and - for stepper widget
case WWT_BUTTON: // + and - for spinner widget
{
if (attempts > 0)
{
@ -284,7 +284,7 @@ static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex,
attempts++;
if (attempts > 2)
{
// We're 2 buttons up, and no preview or stepper widget was found
// We're 2 buttons up, and no preview or spinner widget was found
return false;
}
@ -303,7 +303,7 @@ static bool window_other_wheel_input(rct_window* w, rct_widgetindex widgetIndex,
expectedContent[0] = IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE;
expectedContent[1] = IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE;
break;
case WWT_STEPPER:
case WWT_SPINNER:
buttonWidgetIndex = wheel < 0 ? widgetIndex + 1 : widgetIndex + 2;
expectedType = WWT_BUTTON;
expectedContent[0] = STR_NUMERIC_UP;