bigtime theme changes. bigtime.

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index b4d7cd1dcb92434a7ea02d27c09b01f66609f04d..e52b16c4faa5beca8c9b4c32dd18f2ec6d367131 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -15,7 +15,7 @@ struct _RrTheme {
     gboolean show_handle;
 
     /* style settings - geometry */
-    gint bevel;
+    gint padding;
     gint handle_height;
     gint bwidth;
     gint cbwidth;
@@ -43,7 +43,6 @@ struct _RrTheme {
     RrColor *titlebut_unfocused_unpressed_color;
     RrColor *menu_title_color;
     RrColor *menu_color;
-    RrColor *menu_bullet_color;
     RrColor *menu_disabled_color;
     RrColor *menu_selected_color;
 
@@ -143,20 +142,21 @@ struct _RrTheme {
     RrAppearance *a_unfocused_handle;
     RrAppearance *a_menu_title;
     RrAppearance *a_menu;
-    RrAppearance *a_menu_item;
+    RrAppearance *a_menu_normal;
     RrAppearance *a_menu_disabled;
     RrAppearance *a_menu_selected;
-    RrAppearance *a_menu_text_item;
+    RrAppearance *a_menu_text_normal;
     RrAppearance *a_menu_text_disabled;
     RrAppearance *a_menu_text_selected;
-    RrAppearance *a_menu_bullet;
+    RrAppearance *a_menu_bullet_normal;
+    RrAppearance *a_menu_bullet_selected;
     RrAppearance *a_clear;     /* clear with no texture */
     RrAppearance *a_clear_tex; /* clear with a texture */
 
-    RrAppearance *app_selected_bg;
-    RrAppearance *app_unselected_bg;
-    RrAppearance *app_selected_label;
-    RrAppearance *app_unselected_label;
+    RrAppearance *app_hilite_bg;
+    RrAppearance *app_unhilite_bg;
+    RrAppearance *app_hilite_label;
+    RrAppearance *app_unhilite_label;
 
 };