kill a warning

[chaz/openbox] / render / theme.c

diff --git a/render/theme.c b/render/theme.c
index 65eee18093a4071d757d3310f88bd9d9a7047dc2..c87f58c2f6ebe23b39ccdaa1f3e012ff4c899678 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -35,6 +35,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
 
     theme->inst = inst;
 
+    theme->show_handle = TRUE;
+
     theme->a_disabled_focused_max = RrAppearanceNew(inst, 1);
     theme->a_disabled_unfocused_max = RrAppearanceNew(inst, 1);
     theme->a_hover_focused_max = RrAppearanceNew(inst, 1);
@@ -146,14 +148,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     /* load direct dimensions */
     if (!read_int(db, "menuOverlap", &theme->menu_overlap) ||
        theme->menu_overlap < 0 || theme->menu_overlap > 20)
-        theme->handle_height = 0;
-    if (!read_int(db, "handleWidth", &theme->handle_height) ||
-       theme->handle_height < 0 || theme->handle_height > 100)
+        theme->menu_overlap = 0;
+    if (!read_int(db, "handleWidth", &theme->handle_height))
+        theme->handle_height = 6;
+    if (!theme->handle_height)
+        theme->show_handle = FALSE;
+    if (theme->handle_height <= 0 || theme->handle_height > 100)
         theme->handle_height = 6;
     if (!read_int(db, "bevelWidth", &theme->bevel) ||
-       theme->bevel <= 0 || theme->bevel > 100) theme->bevel = 3;
+       theme->bevel <= 0 || theme->bevel > 100)
+        theme->bevel = 3;
     if (!read_int(db, "borderWidth", &theme->bwidth) ||
-       theme->bwidth < 0 || theme->bwidth > 100) theme->bwidth = 1;
+       theme->bwidth < 0 || theme->bwidth > 100)
+        theme->bwidth = 1;
     if (!read_int(db, "frameWidth", &theme->cbwidth) ||
        theme->cbwidth < 0 || theme->cbwidth > 100)
         theme->cbwidth = theme->bevel;
@@ -405,8 +412,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     }
 
     if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) {
-        guchar data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 };
-        theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, (char*)data);
+        guchar data[] = { 0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };
+        theme->menu_bullet_mask = RrPixmapMaskNew(inst, 4, 7, (char*)data);
     }
 
     /* read the decoration textures */