try again. merge r6177-6182 from 3.4-working

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index b0caa171bbc84d0a449a1121ca399751ffab5f69..8f66a383f8689d77a874b1dc89075e99b2a39f76 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -51,9 +51,10 @@ struct _RrTheme {
     gint menu_font_height;
     gint label_height;
     gint title_height;
-    gint menu_title_height;
     gint button_size;
     gint grip_width;
+    gint menu_title_label_height;
+    gint menu_title_height;
 
     /* style settings - colors */
     RrColor *menu_b_color;
@@ -78,8 +79,9 @@ struct _RrTheme {
     RrColor *titlebut_unfocused_unpressed_color;
     RrColor *menu_title_color;
     RrColor *menu_color;
-    RrColor *menu_disabled_color;
     RrColor *menu_selected_color;
+    RrColor *menu_disabled_color;
+    RrColor *menu_disabled_selected_color;
     RrColor *title_focused_shadow_color;
     gchar    title_focused_shadow_alpha;
     RrColor *title_unfocused_shadow_color;
@@ -95,6 +97,8 @@ struct _RrTheme {
     gchar    menu_text_selected_shadow_alpha;
     RrColor *menu_text_disabled_shadow_color;
     gchar    menu_text_disabled_shadow_alpha;
+    RrColor *menu_text_disabled_selected_shadow_color;
+    gchar    menu_text_disabled_selected_shadow_alpha;
 
     /* style settings - pics */
     RrPixel32 *def_win_icon; /* 48x48 RGBA */
@@ -206,10 +210,12 @@ struct _RrTheme {
     RrAppearance *a_menu_title;
     RrAppearance *a_menu;
     RrAppearance *a_menu_normal;
-    RrAppearance *a_menu_disabled;
     RrAppearance *a_menu_selected;
+    RrAppearance *a_menu_disabled;
+    RrAppearance *a_menu_disabled_selected;
     RrAppearance *a_menu_text_normal;
     RrAppearance *a_menu_text_disabled;
+    RrAppearance *a_menu_text_disabled_selected;
     RrAppearance *a_menu_text_selected;
     RrAppearance *a_menu_bullet_normal;
     RrAppearance *a_menu_bullet_selected;