From: Dana Jansens <danakj@orodu.net>
Date: Mon, 8 Aug 2011 19:42:48 +0000 (-0400)
Subject: Make the inactive osd text color fall back to the old osd property, and lastly inheri... 
X-Git-Tag: mikabox-3.5-7~74
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=9415459aea725f6a1dd4f91526e7a95090de0130;hp=d58ed5c413e052e7ff58aa1ea15b475e9c335e07

Make the inactive osd text color fall back to the old osd property, and lastly inherit from the unfocused window color.
---

diff --git a/obrender/theme.c b/obrender/theme.c
index b20182a..634fc51 100644
--- a/obrender/theme.c
+++ b/obrender/theme.c
@@ -324,8 +324,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
                 "osd.label.text.color",
                 theme->osd_text_active_color, RrColorCopy(theme->title_focused_color));
 
-    READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
-               RrColorNew(inst, 0xff, 0xff, 0xff));
+    READ_COLOR_("osd.inactive.label.text.color",
+                "osd.label.text.color",
+                theme->osd_text_inactive_color, RrColorCopy(theme->title_unfocused_color));
 
     READ_COLOR("window.active.button.unpressed.image.color",
                theme->titlebut_focused_unpressed_color,