mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Code Issues Releases Wiki Activity

Create WindowColour enum for widget definition calls (#12722)

Browse Source 
* Make MakeWidget* functions take enum colour

* Make windows A-D use WindowColour enum

* Make windows E-G use WindowColour enum

* Make windows I-M use WindowColour enum

* Make windows N-P use WindowColour enum

* Make windows R-S use WindowColour enum

* Make windows T use WindowColour enum

* Make windows V-W use WindowColour enum
This commit is contained in:
Tulio Leao
2020-08-28 23:31:31 -03:00
committed by GitHub
parent 8d366ebaea
commit 731a93dc39
74 changed files with 1030 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 },
};