From: Dave Foster <daf@minuslab.net>
Date: Tue, 18 Dec 2007 19:11:04 +0000 (-0500)
Subject: Menu bullet color support.
X-Git-Tag: release-3.5.1~138^2~4
X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=464ee8996e6478e8bd6fc8c8e9df220187c51786

Menu bullet color support.
---

diff --git a/obrender/theme.c b/obrender/theme.c
index 442c8b8..29db238 100644
--- a/obrender/theme.c
+++ b/obrender/theme.c
@@ -371,6 +371,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
     READ_COLOR("menu.items.text.color", theme->menu_color,
                RrColorNew(inst, 0xff, 0xff, 0xff));
 
+    READ_COLOR("menu.bullet.image.color", theme->menu_bullet_color,
+               RrColorCopy(theme->menu_color));
+   
     READ_COLOR("menu.items.disabled.text.color", theme->menu_disabled_color,
                RrColorNew(inst, 0, 0, 0));
 
@@ -383,7 +386,11 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
 
     READ_COLOR("menu.separator.color", theme->menu_sep_color,
                RrColorCopy(theme->menu_color));
-
+    
+    READ_COLOR("menu.bullet.selected.image.color", 
+               theme->menu_bullet_selected_color,
+               RrColorCopy(theme->menu_selected_color));
+ 
     /* load the image masks */
 
     /* maximize button masks */
@@ -1456,9 +1463,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
     theme->btn_iconify->a_unfocused_pressed->texture[0].data.mask.color = 
         theme->btn_iconify->unfocused_pressed_color;
     theme->a_menu_bullet_normal->texture[0].data.mask.color =
-        theme->menu_color;
+        theme->menu_bullet_color;
     theme->a_menu_bullet_selected->texture[0].data.mask.color =
-        theme->menu_selected_color;
+        theme->menu_bullet_selected_color;
 
     g_free(path);
     XrmDestroyDatabase(db);
@@ -1565,6 +1572,8 @@ void RrThemeFree(RrTheme *theme)
         RrColorFree(theme->menu_title_color);
         RrColorFree(theme->menu_sep_color);
         RrColorFree(theme->menu_color);
+        RrColorFree(theme->menu_bullet_color);
+        RrColorFree(theme->menu_bullet_selected_color);
         RrColorFree(theme->menu_selected_color);
         RrColorFree(theme->menu_disabled_color);
         RrColorFree(theme->menu_disabled_selected_color);
diff --git a/obrender/theme.h b/obrender/theme.h
index bbb5571..3844e6d 100644
--- a/obrender/theme.h
+++ b/obrender/theme.h
@@ -90,6 +90,8 @@ struct _RrTheme {
     RrColor *menu_title_color;
     RrColor *menu_sep_color;
     RrColor *menu_color;
+    RrColor *menu_bullet_color;
+    RrColor *menu_bullet_selected_color;
     RrColor *menu_selected_color;
     RrColor *menu_disabled_color;
     RrColor *menu_disabled_selected_color;