add colors for the app_label text

diff --git a/render2/theme.h b/render2/theme.h
index 8386d3154c5b75b59a7bdf9562a5ea0ba8bb8993..3d309e2e24c76569a51aae4dcaf05b1075fea7d7 100644 (file)
--- a/render2/theme.h
+++ b/render2/theme.h
@@ -79,6 +79,9 @@ struct RrTheme {
     struct RrSurface *menu_disabled;
     struct RrSurface *menu_hilite;
 
+    struct RrColor app_label_color;
+    struct RrColor app_label_color_h; /* hilited */
+
     struct RrSurface *app_bg;
     struct RrSurface *app_bg_h; /* hilited */
     struct RrSurface *app_label;
@@ -86,11 +89,10 @@ struct RrTheme {
     struct RrSurface *app_icon;
 };
 
-#define RrThemeLabelHeight(t) (RrFontHeight((t)->title_font) + 2)
+#define RrThemeLabelHeight(t) (RrFontHeight((t)->title_font))
 #define RrThemeTitleHeight(t) (RrThemeLabelHeight(t) + \
                                ((t)->bevel + (t)->bwidth) * 2)
-#define RrThemeButtonSize(t)  (RrThemeLabelHeight(t) - \
-                               ((t)->bevel + (t)->bwidth) * 2)
+#define RrThemeButtonSize(t)  (RrThemeLabelHeight(t) - (t)->bevel * 2)
 #define RrThemeGripWidth(t)   (RrThemeButtonSize(t) * 2)
 
 #endif