add theme entries for new windows

data/language/english_uk.txt

@@ -4040,6 +4040,8 @@ STR_5733    :Use NN scaling at integer scales
 # tooltip for tab in options window
 STR_5734    :{SMALLFONT}{BLACK}Rendering
 
+STR_5719    :Network Status
+
 #############
 # Scenarios #
 ################

src/interface/Theme.cpp

@@ -150,6 +150,12 @@ WindowThemeDesc WindowThemeDescriptors[] =
     { THEME_WC(WC_EDITOR_TRACK_BOTTOM_TOOLBAR),    5247,       COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BLUE),  TRANSLUCENT(COLOUR_LIGHT_BLUE),  TRANSLUCENT(COLOUR_LIGHT_BLUE)                     ) },
     { THEME_WC(WC_EDITOR_SCENARIO_BOTTOM_TOOLBAR), 5248,       COLOURS_3(TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_LIGHT_BROWN), TRANSLUCENT(COLOUR_MOSS_GREEN)                     ) },
     { THEME_WC(WC_TITLE_EDITOR),                   5433,       COLOURS_3(COLOUR_GREY,                     COLOUR_OLIVE_GREEN,              COLOUR_OLIVE_GREEN                                 ) },
+    { THEME_WC(WC_TILE_INSPECTOR),                 5314,       COLOURS_2(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                                                   ) },
+    { THEME_WC(WC_CHANGELOG),                      5344,       COLOURS_2(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                                                   ) },
+    { THEME_WC(WC_MULTIPLAYER),                    5502,       COLOURS_3(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                  ) },
+    { THEME_WC(WC_PLAYER),                         5496,       COLOURS_3(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                  ) },
+    { THEME_WC(WC_NETWORK_STATUS),                 5719,       COLOURS_1(COLOUR_LIGHT_BLUE                                                                                                    ) },
+    { THEME_WC(WC_SERVER_LIST),                    5498,       COLOURS_2(COLOUR_LIGHT_BLUE,               COLOUR_LIGHT_BLUE                                                                   ) },
 };
 
 #pragma endregion

src/windows/changelog.c

@@ -1,14 +1,15 @@
 #include "../addresses.h"
 #include "../localisation/localisation.h"
+#include "../interface/themes.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../interface/viewport.h"
-#include "../world/scenery.h"
-#include "../world/map.h"
-#include "../world/footpath.h"
-#include "../util/util.h"
 #include "../openrct2.h"
 #include "../platform/platform.h"
+#include "../util/util.h"
+#include "../world/footpath.h"
+#include "../world/map.h"
+#include "../world/scenery.h"
 
 enum {
 	WIDX_BACKGROUND,
@@ -105,9 +106,6 @@ rct_window *window_changelog_open()
 	window->enabled_widgets = (1 << WIDX_CLOSE);
 
 	window_init_scroll_widgets(window);
-	window->colours[0] = 7;
-	window->colours[1] = 7;
-	window->colours[2] = 7;
 	window->min_width = MIN_WW;
 	window->min_height = MIN_WH;
 	window->max_width = MIN_WW;
@@ -157,6 +155,8 @@ static void window_changelog_scrollgetsize(rct_window *w, int scrollIndex, int *
 
 static void window_changelog_invalidate(rct_window *w)
 {
+	colour_scheme_update(w);
+
 	window_changelog_widgets[WIDX_BACKGROUND].right = w->width - 1;
 	window_changelog_widgets[WIDX_BACKGROUND].bottom = w->height - 1;
 	window_changelog_widgets[WIDX_TITLE].right = w->width - 2;

src/windows/multiplayer.c

@@ -205,9 +205,6 @@ void window_multiplayer_open()
 
 	window->page = WINDOW_MULTIPLAYER_PAGE_PLAYERS;
 	window->list_information_type = 0;
-	window->colours[0] = 7;
-	window->colours[1] = 7;
-	window->colours[2] = 7;
 }
 
 static void window_multiplayer_set_page(rct_window* w, int page){
@@ -366,6 +363,8 @@ static void window_multiplayer_players_scrollmouseover(rct_window *w, int scroll
 
 static void window_multiplayer_players_invalidate(rct_window *w)
 {
+	colour_scheme_update(w);
+
 	window_multiplayer_set_pressed_tab(w);
 	window_multiplayer_anchor_border_widgets(w);
 	window_multiplayer_players_widgets[WIDX_LIST].right = w->width - 4;

src/windows/network_status.c

@@ -106,9 +106,6 @@ void window_network_status_open(const char* text)
 
 	window->page = 0;
 	window->list_information_type = 0;
-	window->colours[0] = 7;
-	window->colours[1] = 7;
-	window->colours[2] = 7;
 }
 
 void window_network_status_close()
@@ -158,6 +155,8 @@ static void window_network_status_textinput(rct_window *w, int widgetIndex, char
 
 static void window_network_status_invalidate(rct_window *w)
 {
+	colour_scheme_update(w);
+
 	window_network_status_widgets[WIDX_BACKGROUND].right = w->width - 1;
 	window_network_status_widgets[WIDX_BACKGROUND].bottom = w->height - 1;
 	window_network_status_widgets[WIDX_TITLE].right = w->width - 2;

src/windows/player.c

@@ -376,9 +376,7 @@ void window_player_overview_invalidate(rct_window *w)
 		window_init_scroll_widgets(w);
 	}
 
-	w->colours[0] = 7;
+	colour_scheme_update(w);
-	w->colours[1] = 7;
-	w->colours[2] = 7;
 
 	w->pressed_widgets &= ~(WIDX_TAB_1);
 	w->pressed_widgets |= 1ULL << (w->page + WIDX_TAB_1);

src/windows/server_list.c

@@ -367,6 +367,8 @@ static void window_server_list_textinput(rct_window *w, int widgetIndex, char *t
 
 static void window_server_list_invalidate(rct_window *w)
 {
+	colour_scheme_update(w);
+
 	RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS, char *) = gVersion;
 	window_server_list_widgets[WIDX_BACKGROUND].right = w->width - 1;
 	window_server_list_widgets[WIDX_BACKGROUND].bottom = w->height - 1;

src/windows/server_start.c

@@ -136,9 +136,6 @@ void window_server_start_open()
 
 	window->page = 0;
 	window->list_information_type = 0;
-	window->colours[0] = 1;
-	window->colours[1] = 26;
-	window->colours[2] = 26;
 
 	sprintf(_port, "%u", gConfigNetwork.default_port);
 	safe_strcpy(_name, gConfigNetwork.server_name, sizeof(_name));
@@ -251,6 +248,8 @@ static void window_server_start_textinput(rct_window *w, int widgetIndex, char *
 
 static void window_server_start_invalidate(rct_window *w)
 {
+	colour_scheme_update_by_class(w, WC_SERVER_LIST);
+
 	widget_set_checkbox_value(w, WIDX_ADVERTISE_CHECKBOX, gConfigNetwork.advertise);
 	RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 18, uint16) = gConfigNetwork.maxplayers;
 }

src/windows/themes.c

@@ -238,12 +238,17 @@ static rct_windowclass window_themes_tab_5_classes[] = {
 
 static rct_windowclass window_themes_tab_6_classes[] = {
 	WC_CHEATS,
+	WC_TILE_INSPECTOR,
 	WC_THEMES,
 	WC_TITLE_EDITOR,
 	WC_OPTIONS,
 	WC_KEYBOARD_SHORTCUT_LIST,
 	WC_CHANGE_KEYBOARD_SHORTCUT,
-	WC_LOADSAVE
+	WC_LOADSAVE,
+	WC_CHANGELOG,
+	WC_SERVER_LIST,
+	WC_MULTIPLAYER,
+	WC_PLAYER,
 };
 
 static rct_windowclass window_themes_tab_7_classes[] = {
@@ -251,7 +256,8 @@ static rct_windowclass window_themes_tab_7_classes[] = {
 	WC_DEMOLISH_RIDE_PROMPT,
 	WC_FIRE_PROMPT,
 	WC_TRACK_DELETE_PROMPT,
-	WC_LOADSAVE_OVERWRITE_PROMPT
+	WC_LOADSAVE_OVERWRITE_PROMPT,
+	WC_NETWORK_STATUS,
 };
 
 static rct_windowclass *window_themes_tab_classes[] = {

src/windows/tile_inspector.c

@@ -20,6 +20,7 @@
 
 #include "../addresses.h"
 #include "../localisation/localisation.h"
+#include "../interface/themes.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../interface/viewport.h"
@@ -170,9 +171,6 @@ void window_tile_inspector_open()
 	window->disabled_widgets = (1 << WIDX_CORRUPT) | (1 << WIDX_MOVE_UP) | (1 << WIDX_MOVE_DOWN) | (1 << WIDX_REMOVE);
 
 	window_init_scroll_widgets(window);
-	window->colours[0] = 7;
-	window->colours[1] = 7;
-	window->colours[2] = 7;
 	window->min_width = MIN_WW;
 	window->min_height = MIN_WH;
 	window->max_width = MAX_WW;
@@ -433,6 +431,8 @@ static void window_tile_inspector_scrollmouseover(rct_window *w, int scrollIndex
 
 static void window_tile_inspector_invalidate(rct_window *w)
 {
+	colour_scheme_update(w);
+
 	window_tile_inspector_widgets[WIDX_BACKGROUND].right = w->width - 1;
 	window_tile_inspector_widgets[WIDX_BACKGROUND].bottom = w->height - 1;
 	window_tile_inspector_widgets[WIDX_CLOSE].left = w->width - 13;