From 24f91991b5436dcb5b34fc7d638bfe36dc52a3e3 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 23:52:58 +0900 Subject: [PATCH] FIX: Unreadable text color with dark theme in edit UIs --- gui/citybuilding_edit.cc | 6 +++--- gui/curiosity_edit.cc | 6 +++--- gui/factory_edit.cc | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gui/citybuilding_edit.cc b/gui/citybuilding_edit.cc index 37ea6d13a..c2398cff9 100644 --- a/gui/citybuilding_edit.cc +++ b/gui/citybuilding_edit.cc @@ -187,9 +187,9 @@ void citybuilding_edit_frame_t::fill_list() // color code for objects: BLACK: normal, YELLOW: consumer only, GREEN: source only PIXVAL color; switch (i->get_type()) { - case building_desc_t::city_res: color = color_idx_to_rgb(COL_BLUE); break; - case building_desc_t::city_com: color = color_idx_to_rgb(COL_DARK_GREEN); break; - default: color = SYSCOL_TEXT; break; + case building_desc_t::city_res: color = color_idx_to_rgb(COL_DARK_BLUE + env_t::gui_player_color_dark); break; + case building_desc_t::city_com: color = color_idx_to_rgb(40 + env_t::gui_player_color_dark); break; + default: color = SYSCOL_TEXT; break; } char const* const name = get_sortedby()==gui_sorting_item_t::BY_NAME_OBJECT ? i->get_name() : translator::translate(i->get_name()); scl.new_component(name, color); diff --git a/gui/curiosity_edit.cc b/gui/curiosity_edit.cc index 0a3c5470c..a95870b58 100644 --- a/gui/curiosity_edit.cc +++ b/gui/curiosity_edit.cc @@ -183,9 +183,9 @@ void curiosity_edit_frame_t::fill_list() // color code for objects: BLACK: normal, YELLOW: consumer only, GREEN: source only PIXVAL color; switch (i->get_type()) { - case building_desc_t::attraction_city: color = color_idx_to_rgb(COL_BLUE); break; - case building_desc_t::attraction_land: color = color_idx_to_rgb(COL_DARK_GREEN); break; - default: color = color_idx_to_rgb(COL_BLACK); break; + case building_desc_t::attraction_city: color = color_idx_to_rgb(COL_DARK_BLUE+env_t::gui_player_color_dark); break; + case building_desc_t::attraction_land: color = color_idx_to_rgb(40 + env_t::gui_player_color_dark); break; + default: color = SYSCOL_TEXT; break; } char const* const name = get_sortedby()==gui_sorting_item_t::BY_NAME_OBJECT ? i->get_name() : translator::translate(i->get_name()); scl.new_component(name, color); diff --git a/gui/factory_edit.cc b/gui/factory_edit.cc index a3b59e2af..52029b210 100644 --- a/gui/factory_edit.cc +++ b/gui/factory_edit.cc @@ -197,8 +197,8 @@ void factory_edit_frame_t::fill_list() scl.set_selection(-1); FOR(vector_tpl, const i, factory_list) { PIXVAL const color = - i->is_consumer_only() ? color_idx_to_rgb(COL_BLUE) : - i->is_producer_only() ? color_idx_to_rgb(COL_DARK_GREEN) : + i->is_consumer_only() ? color_idx_to_rgb(COL_DARK_BLUE + env_t::gui_player_color_dark) : + i->is_producer_only() ? color_idx_to_rgb(40 + env_t::gui_player_color_dark) : SYSCOL_TEXT; char const* const name = get_sortedby()==gui_sorting_item_t::BY_NAME_OBJECT ? i->get_name() : translator::translate(i->get_name()); scl.new_component(name, color);