From 7a9cfb4be73d900ad4735edc507b62199c3ccb7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=28=C2=B4=E3=83=BB=CF=89=E3=83=BB=EF=BD=80=29?= Date: Sun, 28 Feb 2021 23:28:55 +0900 Subject: [PATCH] CHG: The brightness of the player color background color of the titlebar can be set individually. --- dataobj/environment.cc | 2 ++ dataobj/environment.h | 2 ++ gui/gui_frame.cc | 2 +- gui/gui_theme.cc | 2 ++ themes.src/highcontrast-large/high-contrast-large.tab | 3 ++- themes.src/highcontrast/high-contrast.tab | 3 ++- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dataobj/environment.cc b/dataobj/environment.cc index 0971a31e7..c84a3bc95 100644 --- a/dataobj/environment.cc +++ b/dataobj/environment.cc @@ -153,6 +153,7 @@ sint8 env_t::show_money_message; uint8 env_t::gui_player_color_dark = 1; uint8 env_t::gui_player_color_bright = 4; +uint8 env_t::gui_titlebar_player_color_background_brightness; std::string env_t::fontname = FONT_PATH_X "prop.fnt"; uint8 env_t::fontsize = 11; @@ -539,6 +540,7 @@ void env_t::rdwr(loadsave_t *file) if( file->is_loading() ) { soundfont_filename = str ? str.c_str() : ""; } + file->rdwr_byte(gui_titlebar_player_color_background_brightness); } // server settings are not saved, since they are server specific diff --git a/dataobj/environment.h b/dataobj/environment.h index 79e3bd6ae..bd2d2e510 100644 --- a/dataobj/environment.h +++ b/dataobj/environment.h @@ -231,6 +231,8 @@ class env_t static uint8 gui_player_color_dark; static uint8 gui_player_color_bright; + // brightness level of the player color of the titlebar background + static uint8 gui_titlebar_player_color_background_brightness; // default font name and -size static std::string fontname; diff --git a/gui/gui_frame.cc b/gui/gui_frame.cc index ba223d8c9..f082cff57 100644 --- a/gui/gui_frame.cc +++ b/gui/gui_frame.cc @@ -94,7 +94,7 @@ void gui_frame_t::reset_min_windowsize() */ FLAGGED_PIXVAL gui_frame_t::get_titlecolor() const { - return owner ? PLAYER_FLAG|color_idx_to_rgb(owner->get_player_color1()+env_t::gui_player_color_dark) : env_t::default_window_title_color; + return owner ? PLAYER_FLAG|color_idx_to_rgb(owner->get_player_color1()+env_t::gui_titlebar_player_color_background_brightness) : env_t::default_window_title_color; } diff --git a/gui/gui_theme.cc b/gui/gui_theme.cc index 4233b221c..a80b1c9b7 100644 --- a/gui/gui_theme.cc +++ b/gui/gui_theme.cc @@ -542,6 +542,8 @@ bool gui_theme_t::themes_init(const char *file_name, bool init_fonts, bool init_ env_t::gui_player_color_bright = contents.get_int("gui_player_color_bright", env_t::gui_player_color_bright ); env_t::gui_player_color_dark = contents.get_int("gui_player_color_dark", env_t::gui_player_color_dark ); + env_t::gui_titlebar_player_color_background_brightness = env_t::gui_player_color_dark; + env_t::gui_titlebar_player_color_background_brightness = contents.get_int("gui_titlebar_player_color_background_brightness", env_t::gui_titlebar_player_color_background_brightness); env_t::default_window_title_color = contents.get_color("default_window_title_color", env_t::default_window_title_color, &env_t::default_window_title_color_rgb ); env_t::front_window_text_color = contents.get_color("front_window_text_color", env_t::front_window_text_color, &env_t::front_window_text_color_rgb ); diff --git a/themes.src/highcontrast-large/high-contrast-large.tab b/themes.src/highcontrast-large/high-contrast-large.tab index a3ac023a8..e08d53fce 100644 --- a/themes.src/highcontrast-large/high-contrast-large.tab +++ b/themes.src/highcontrast-large/high-contrast-large.tab @@ -113,8 +113,9 @@ cursor_overlay_color = #000000 gui_color_loadingbar_progress = #000000 gui_color_loadingbar_inner = #868c86 -gui_player_color_dark = 5 +gui_player_color_dark = 5 gui_player_color_bright = 5 +gui_titlebar_player_color_background_brightness = 2 ##################################size stuff################################## diff --git a/themes.src/highcontrast/high-contrast.tab b/themes.src/highcontrast/high-contrast.tab index be8bfb09a..8523d5b02 100644 --- a/themes.src/highcontrast/high-contrast.tab +++ b/themes.src/highcontrast/high-contrast.tab @@ -113,8 +113,9 @@ cursor_overlay_color = #000000 gui_color_loadingbar_progress = #000000 gui_color_loadingbar_inner = #868c86 -gui_player_color_dark = 5 +gui_player_color_dark = 5 gui_player_color_bright = 5 +gui_titlebar_player_color_background_brightness = 2 ##################################size stuff##################################