guarantee an even height for the label, and thus the titlebar, and thus the buttons...

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index ca8f6c1de7e5e74a2f0f01b309b39d7892df808b..dd9c76536a3a6e05169879885016d11483038959 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -425,7 +425,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         if (!read_mask(&ps, "max_toggled_pressed.xbm",
                        &theme->max_toggled_pressed_mask))
             theme->max_toggled_pressed_mask =
-                RrPixmapMaskCopy(theme->max_pressed_mask);
+                RrPixmapMaskCopy(theme->max_toggled_mask);
         if (!read_mask(&ps, "max_toggled_hover.xbm",
                        &theme->max_toggled_hover_mask))
             theme->max_toggled_hover_mask =
@@ -447,7 +447,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->max_disabled_mask = RrPixmapMaskCopy(theme->max_mask);
         theme->max_hover_mask = RrPixmapMaskCopy(theme->max_mask);
         theme->max_toggled_pressed_mask =
-            RrPixmapMaskCopy(theme->max_pressed_mask);
+            RrPixmapMaskCopy(theme->max_toggled_mask);
         theme->max_toggled_hover_mask =
             RrPixmapMaskCopy(theme->max_toggled_mask);
     }
@@ -486,7 +486,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         if (!read_mask(&ps, "desk_toggled_pressed.xbm",
                        &theme->desk_toggled_pressed_mask))
             theme->desk_toggled_pressed_mask =
-                RrPixmapMaskCopy(theme->desk_pressed_mask);
+                RrPixmapMaskCopy(theme->desk_toggled_mask);
         if (!read_mask(&ps, "desk_toggled_hover.xbm",
                        &theme->desk_toggled_hover_mask))
             theme->desk_toggled_hover_mask =
@@ -509,7 +509,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->desk_disabled_mask = RrPixmapMaskCopy(theme->desk_mask);
         theme->desk_hover_mask = RrPixmapMaskCopy(theme->desk_mask);
         theme->desk_toggled_pressed_mask =
-            RrPixmapMaskCopy(theme->desk_pressed_mask);
+            RrPixmapMaskCopy(theme->desk_toggled_mask);
         theme->desk_toggled_hover_mask =
             RrPixmapMaskCopy(theme->desk_toggled_mask);
     }
@@ -523,7 +523,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         if (!read_mask(&ps, "shade_toggled_pressed.xbm",
                        &theme->shade_toggled_pressed_mask))
             theme->shade_toggled_pressed_mask =
-                RrPixmapMaskCopy(theme->shade_pressed_mask);
+                RrPixmapMaskCopy(theme->shade_toggled_mask);
         if (!read_mask(&ps, "shade_toggled_hover.xbm",
                        &theme->shade_toggled_hover_mask))
             theme->shade_toggled_hover_mask =
@@ -546,7 +546,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         theme->shade_disabled_mask = RrPixmapMaskCopy(theme->shade_mask);
         theme->shade_hover_mask = RrPixmapMaskCopy(theme->shade_mask);
         theme->shade_toggled_pressed_mask =
-            RrPixmapMaskCopy(theme->shade_pressed_mask);
+            RrPixmapMaskCopy(theme->shade_toggled_mask);
         theme->shade_toggled_hover_mask =
             RrPixmapMaskCopy(theme->shade_toggled_mask);
     }
@@ -1191,6 +1191,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
         RrMargins(theme->a_focused_label, &fl, &ft, &fr, &fb);
         RrMargins(theme->a_unfocused_label, &ul, &ut, &ur, &ub);
         theme->label_height = theme->win_font_height + MAX(ft + fb, ut + ub);
+        theme->label_height += theme->label_height % 2;
 
         /* this would be nice I think, since padding.width can now be 0,
            but it breaks frame.c horribly and I don't feel like fixing that