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

Make scatter window themeable; default to scenario window style.

This commit is contained in:
Aaron van Geffen 2020-02-01 22:38:54 +01:00
parent 205ff401ab
commit 6f029055a3
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/language/en-GB.txt
View File

@ -3671,6 +3671,7 @@ STR_6349 :Random title sequence
STR_6350 :Scatter
STR_6351 :{BLACK}Size
STR_6352 :{BLACK}Amount
STR_6353 :Scenery Scatter Tool
#############
# Scenarios #

1
src/openrct2-ui/interface/Theme.cpp
View File

@ -124,6 +124,7 @@ static constexpr const WindowThemeDesc WindowThemeDescriptors[] =
{ THEME_WC(WC_CONSTRUCT_RIDE), STR_THEMES_WINDOW_CONSTRUCT_RIDE, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_BORDEAUX_RED, COLOUR_BORDEAUX_RED ) },
{ THEME_WC(WC_DEMOLISH_RIDE_PROMPT), STR_THEMES_WINDOW_DEMOLISH_RIDE_PROMPT, COLOURS_1(TRANSLUCENT(COLOUR_BORDEAUX_RED) ) },
{ THEME_WC(WC_SCENERY), STR_THEMES_WINDOW_SCENERY, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN ) },
{ THEME_WC(WC_SCENERY_SCATTER), STR_THEMES_WINDOW_SCENERY_SCATTER, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_GREEN, COLOUR_DARK_GREEN ) },
{ THEME_WC(WC_OPTIONS), STR_THEMES_WINDOW_OPTIONS, COLOURS_3(COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE, COLOUR_LIGHT_BLUE ) },
{ THEME_WC(WC_FOOTPATH), STR_THEMES_WINDOW_FOOTPATH, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) },
{ THEME_WC(WC_LAND), STR_THEMES_WINDOW_LAND, COLOURS_3(COLOUR_DARK_BROWN, COLOUR_DARK_BROWN, COLOUR_DARK_BROWN ) },

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

@ -36,11 +36,11 @@ static rct_widget window_scenery_scatter_widgets[] = {
{ WWT_CAPTION, 0, 0, 57, 1, 14, STR_SCENERY_SCATTER, STR_WINDOW_TITLE_TIP }, // title bar
{ WWT_CLOSEBOX, 0, 57, 68, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP }, // close x button
{ WWT_IMGBTN, 0, 5, 48, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE }, // preview box
{ WWT_IMGBTN, 1, 5, 48, 17, 48, SPR_LAND_TOOL_SIZE_0, STR_NONE }, // preview box
{ WWT_TRNBTN, 1, 6, 23, 18, 33, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP }, // decrement size
{ WWT_TRNBTN, 1, 32, 49, 32, 47, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP }, // increment size
{ WWT_IMGBTN, 0, 5, 48, 65, 96, 0xFFFFFFFF, STR_NONE }, // preview box
{ WWT_IMGBTN, 1, 5, 48, 65, 96, 0xFFFFFFFF, STR_NONE }, // preview box
{ WWT_TRNBTN, 1, 6, 23, 66, 81, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_DECREASE, STR_ADJUST_SMALLER_LAND_TIP }, // decrement size amount
{ WWT_TRNBTN, 1, 32, 49, 80, 94, IMAGE_TYPE_REMAP | SPR_LAND_TOOL_INCREASE, STR_ADJUST_LARGER_LAND_TIP }, // increment size amount
{ WIDGETS_END },
@ -107,8 +107,6 @@ rct_window* window_scenery_scatter_open()
window_init_scroll_widgets(window);
window_push_others_below(window);
window->colours[2] = COLOUR_DARK_GREEN;
return window;
}

1
src/openrct2-ui/windows/Themes.cpp
View File

@ -200,6 +200,7 @@ static rct_windowclass window_themes_tab_3_classes[] = {
WC_CLEAR_SCENERY,
WC_LAND_RIGHTS,
WC_SCENERY,
WC_SCENERY_SCATTER,
WC_FOOTPATH,
WC_RIDE_CONSTRUCTION,
WC_TRACK_DESIGN_PLACE,

1
src/openrct2/localisation/StringIds.h
View File

@ -3899,6 +3899,7 @@ enum
STR_SCENERY_SCATTER = 6350,
STR_SMALL_SIZE = 6351,
STR_SMALL_AMOUNT = 6352,
STR_THEMES_WINDOW_SCENERY_SCATTER = 6353,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
STR_COUNT = 32768