From d62211adfb67f9487ddb5ea892fbe5897a3dc567 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: Tue, 2 Mar 2021 00:38:57 +0900 Subject: [PATCH] CHG: Box frame color can be specified by theme --- gui/components/gui_colorbox.cc | 2 +- gui/components/gui_world_view_t.cc | 2 +- gui/gui_theme.cc | 7 +++++++ gui/gui_theme.h | 2 ++ gui/server_frame.cc | 2 +- simcolor.h | 2 ++ 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gui/components/gui_colorbox.cc b/gui/components/gui_colorbox.cc index 0c1a12519..644103ea1 100644 --- a/gui/components/gui_colorbox.cc +++ b/gui/components/gui_colorbox.cc @@ -29,6 +29,6 @@ scr_size gui_colorbox_t::get_max_size() const void gui_colorbox_t::draw(scr_coord offset) { offset += pos; - display_ddd_box_clip_rgb(offset.x, offset.y, size.w, D_INDICATOR_HEIGHT, color_idx_to_rgb(MN_GREY0), color_idx_to_rgb(MN_GREY4)); + display_ddd_box_clip_rgb(offset.x, offset.y, size.w, D_INDICATOR_HEIGHT, SYSCOL_INDICATOR_BORDER1, SYSCOL_INDICATOR_BORDER2); display_fillbox_wh_clip_rgb(offset.x + 1, offset.y + 1, size.w - 2, D_INDICATOR_HEIGHT-2, color, true); } diff --git a/gui/components/gui_world_view_t.cc b/gui/components/gui_world_view_t.cc index 4eeba202c..270ae85c4 100644 --- a/gui/components/gui_world_view_t.cc +++ b/gui/components/gui_world_view_t.cc @@ -230,7 +230,7 @@ void world_view_t::internal_draw(const scr_coord offset, obj_t const* const obj) } display_set_clip_wh(old_clip.x, old_clip.y, old_clip.w, old_clip.h); - display_ddd_box_clip_rgb(pos.x - 1, pos.y - 1, size.w + 2, size.h + 2, color_idx_to_rgb(MN_GREY0), color_idx_to_rgb(MN_GREY4)); + display_ddd_box_clip_rgb(pos.x - 1, pos.y - 1, size.w + 2, size.h + 2, SYSCOL_INDICATOR_BORDER1, SYSCOL_INDICATOR_BORDER2); } diff --git a/gui/gui_theme.cc b/gui/gui_theme.cc index a80b1c9b7..2428fe4dc 100644 --- a/gui/gui_theme.cc +++ b/gui/gui_theme.cc @@ -56,6 +56,8 @@ PIXVAL gui_theme_t::gui_color_statusbar_background; PIXVAL gui_theme_t::gui_color_statusbar_divider; PIXVAL gui_theme_t::gui_highlight_color; PIXVAL gui_theme_t::gui_shadow_color; +PIXVAL gui_theme_t::gui_color_indicator_border_top_left; +PIXVAL gui_theme_t::gui_color_indicator_border_bottom_right; PIXVAL gui_theme_t::gui_color_loadingbar_inner; PIXVAL gui_theme_t::gui_color_loadingbar_progress; PIXVAL gui_theme_t::gui_color_obsolete; @@ -174,6 +176,9 @@ void gui_theme_t::init_gui_defaults() gui_highlight_color = color_idx_to_rgb(MN_GREY4); gui_shadow_color = color_idx_to_rgb(MN_GREY0); + gui_color_indicator_border_top_left = color_idx_to_rgb(MN_GREY0); + gui_color_indicator_border_bottom_right = color_idx_to_rgb(MN_GREY4); + gui_color_loadingbar_inner = color_idx_to_rgb(COL_GREY5); gui_color_loadingbar_progress = color_idx_to_rgb(COL_BLUE); @@ -518,6 +523,8 @@ bool gui_theme_t::themes_init(const char *file_name, bool init_fonts, bool init_ gui_theme_t::gui_color_statusbar_divider = (PIXVAL)contents.get_color("gui_color_statusbar_divider", SYSCOL_STATUSBAR_DIVIDER); gui_theme_t::gui_highlight_color = (PIXVAL)contents.get_color("gui_highlight_color", SYSCOL_HIGHLIGHT); gui_theme_t::gui_shadow_color = (PIXVAL)contents.get_color("gui_shadow_color", SYSCOL_SHADOW); + gui_theme_t::gui_color_indicator_border_top_left = (PIXVAL)contents.get_color("gui_color_indicator_border_top_left", SYSCOL_INDICATOR_BORDER1); + gui_theme_t::gui_color_indicator_border_bottom_right= (PIXVAL)contents.get_color("gui_color_indicator_border_bottom_right", SYSCOL_INDICATOR_BORDER2); gui_theme_t::gui_color_loadingbar_inner = (PIXVAL)contents.get_color("gui_color_loadingbar_inner", SYSCOL_LOADINGBAR_INNER); gui_theme_t::gui_color_loadingbar_progress = (PIXVAL)contents.get_color("gui_color_loadingbar_progress", SYSCOL_LOADINGBAR_PROGRESS); gui_theme_t::gui_color_obsolete = (PIXVAL)contents.get_color("gui_color_obsolete", SYSCOL_OBSOLETE); diff --git a/gui/gui_theme.h b/gui/gui_theme.h index fde281ad7..8f29335ef 100644 --- a/gui/gui_theme.h +++ b/gui/gui_theme.h @@ -241,6 +241,8 @@ class gui_theme_t { static PIXVAL gui_color_statusbar_divider; //@< Color to draw statusbar divider static PIXVAL gui_highlight_color; //@< Color to draw highlight dividers (tabs) static PIXVAL gui_shadow_color; //@< Color to draw shadowed dividers (tabs) + static PIXVAL gui_color_indicator_border_top_left; + static PIXVAL gui_color_indicator_border_bottom_right; static PIXVAL gui_color_loadingbar_inner; static PIXVAL gui_color_loadingbar_progress; static PIXVAL gui_color_obsolete; //@< Color for obsolete convois/server entries diff --git a/gui/server_frame.cc b/gui/server_frame.cc index 3696c0f53..c3ae24cbf 100644 --- a/gui/server_frame.cc +++ b/gui/server_frame.cc @@ -43,7 +43,7 @@ class gui_minimap_t : public gui_component_t scr_coord p = get_pos() + offset; scr_size mapsize( gi->get_map()->get_width(), gi->get_map()->get_height() ); // 3D border around the map graphic - display_ddd_box_clip_rgb(p.x, p.y, mapsize.w + 2, mapsize.h + 2, color_idx_to_rgb(MN_GREY0), color_idx_to_rgb(MN_GREY4) ); + display_ddd_box_clip_rgb(p.x, p.y, mapsize.w + 2, mapsize.h + 2, SYSCOL_INDICATOR_BORDER1, SYSCOL_INDICATOR_BORDER2 ); display_array_wh( p.x + 1, p.y + 1, mapsize.w, mapsize.h, gi->get_map()->to_array() ); } } diff --git a/simcolor.h b/simcolor.h index cb8d3a0f8..a99a45953 100644 --- a/simcolor.h +++ b/simcolor.h @@ -153,6 +153,8 @@ typedef unsigned int FLAGGED_PIXVAL; #define SYSCOL_STATUSBAR_DIVIDER gui_theme_t::gui_color_statusbar_divider #define SYSCOL_HIGHLIGHT gui_theme_t::gui_highlight_color #define SYSCOL_SHADOW gui_theme_t::gui_shadow_color +#define SYSCOL_INDICATOR_BORDER1 gui_theme_t::gui_color_indicator_border_top_left +#define SYSCOL_INDICATOR_BORDER2 gui_theme_t::gui_color_indicator_border_bottom_right #define SYSCOL_LOADINGBAR_INNER gui_theme_t::gui_color_loadingbar_inner #define SYSCOL_LOADINGBAR_PROGRESS gui_theme_t::gui_color_loadingbar_progress #define SYSCOL_OBSOLETE gui_theme_t::gui_color_obsolete