[Xfce4-commits] [xfce/xfdesktop] 01/01: Fix icon theme colors

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit 2f210966342c560a07cbe1ae74c1c49bcb0ba982
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Mar 17 15:39:52 2014 +0300

    Fix icon theme colors
    
    When the icon theme colors change, either thorugh gtkrc files or
    Xfsettingd, xfdesktop will now properly reflect those changes.
---
 src/xfce-desktop.c        |    1 +
 src/xfdesktop-icon-view.c |    9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index a030f3f..399d2fc 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -1284,6 +1284,7 @@ xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style)
 
     /* reset the icon view style */
     gtk_widget_set_style(desktop->priv->icon_view, NULL);
+    gtk_widget_reset_rc_styles(desktop->priv->icon_view);
 
     old_font_size = desktop->priv->system_font_size;
     if(xfce_desktop_ensure_system_font_size(desktop) != old_font_size
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index 83edcf9..750aa0d 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -3164,11 +3164,10 @@ xfdesktop_icon_view_paint_icon(XfdesktopIconView *icon_view,
               text_extents.width, text_extents.height,
               text_extents.x, text_extents.y);
 
-        xfdesktop_icon_view_draw_text(cr, playout,
-                                      text_extents.x,
-                                      text_extents.y,
-                                      rtl_offset,
-                                      gtk_widget_get_style(widget)->fg);
+        gtk_paint_layout(gtk_widget_get_style(widget), gtk_widget_get_window(widget),
+                         state, FALSE, area, widget, "label",
+                         text_extents.x, text_extents.y, playout);
+
     }
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.