Menu bullet color support.

diff --git a/render/theme.c b/render/theme.c
index 0016456ef3a871f1df7974cc8e30a1888ff20333..f6c03ba26cbaeacb6b7b4049726d3535673cbd59 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -357,6 +357,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));
 
@@ -367,6 +370,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
     READ_COLOR("menu.items.active.text.color", theme->menu_selected_color,
                RrColorNew(inst, 0, 0, 0));
 
+    READ_COLOR("menu.bullet.selected.image.color", 
+               theme->menu_bullet_selected_color,
+               RrColorCopy(theme->menu_selected_color));
+ 
 
     /* load the image masks */
 
@@ -1352,9 +1359,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);
@@ -1460,6 +1467,8 @@ void RrThemeFree(RrTheme *theme)
         RrColorFree(theme->titlebut_unfocused_unpressed_color);
         RrColorFree(theme->menu_title_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/render/theme.h b/render/theme.h
index 631382e7e1e7b5ad6323765b4b644310bb5d2153..88178c8cb3a94f524992818ce21445da57a31cb6 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -84,6 +84,8 @@ struct _RrTheme {
     RrColor *titlebut_unfocused_unpressed_color;
     RrColor *menu_title_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;