summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-01-15 01:29:22 +0100
committerWolfgang Ulbrich <[email protected]>2016-01-18 15:43:58 +0100
commit1ff346876afd37a957aa490be25bdd2fd90e4773 (patch)
tree1c98785855e596371961652fb3357637b05d41af
parentcf39567d3b05b69383c252812c5adf26382c866a (diff)
downloadcaja-1ff346876afd37a957aa490be25bdd2fd90e4773.tar.bz2
caja-1ff346876afd37a957aa490be25bdd2fd90e4773.tar.xz
fix fg-color of dark themes
fixes https://github.com/mate-desktop/caja/issues/81
-rw-r--r--libcaja-private/caja-icon-container.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 8dcda910..f93e633f 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -9581,7 +9581,7 @@ setup_label_gcs (CajaIconContainer *container)
"frame_text", &frame_text,
NULL);
- if (frame_text /* || !eel_background_is_set(background) */)
+ if (frame_text || !caja_icon_container_get_is_desktop (container))
{
setup_gc_with_fg (container, LABEL_COLOR,
eel_gdk_color_to_rgb (&style->text[GTK_STATE_NORMAL]));
@@ -9591,8 +9591,7 @@ setup_label_gcs (CajaIconContainer *container)
}
else
{
- if (container->details->use_drop_shadows ||
- (eel_background_is_dark (background) && eel_background_is_set(background)))
+ if (container->details->use_drop_shadows || eel_background_is_dark (background))
{
setup_gc_with_fg (container, LABEL_COLOR, 0xEFEFEF);
setup_gc_with_fg (container,