From cc9f32ae00ac35f6bd46afd98be2b9a6e4b1847c Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Fri, 15 Jan 2016 01:29:22 +0100 Subject: [PATCH] fix fg-color of dark themes fixes https://github.com/mate-desktop/caja/issues/81 --- libcaja-private/caja-icon-container.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index 94a0ac86d..0465891e1 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -9424,7 +9424,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])); @@ -9434,8 +9434,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,