summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-03-16 18:00:49 +0300
committermonsta <[email protected]>2016-03-17 11:37:38 +0300
commit828aea9083e19cec1a712c349285553197bc1c6f (patch)
tree3a462d78c0111e542a9a613932a947773731b928 /libcaja-private
parent92607629fc6b2503f28e79dcc73e3ac9ed72bffa (diff)
downloadcaja-828aea9083e19cec1a712c349285553197bc1c6f.tar.bz2
caja-828aea9083e19cec1a712c349285553197bc1c6f.tar.xz
icon container: restore original font color select logic
that is, before 057df2dc1d8ea67b477d696ac6feea8aaf392763 the logic itself is valid, but it was somewhat broken later in a few attempts to fix the annoying font color bugs. so let's restore it.
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-icon-container.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index bf00743b..fd0a4dbf 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -9588,7 +9588,7 @@ setup_label_gcs (CajaIconContainer *container)
"frame_text", &frame_text,
NULL);
- if (frame_text || !caja_icon_container_get_is_desktop (container))
+ if (frame_text || !eel_background_is_set (background))
{
setup_gc_with_fg (container, LABEL_COLOR,
eel_gdk_color_to_rgb (&style->text[GTK_STATE_NORMAL]));