From: Dana Jansens <danakj@orodu.net>
Date: Tue, 12 Aug 2003 10:05:36 +0000 (+0000)
Subject: rendering fixups for submenu bullets
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=b1d44ac43ba050026fa6602ec6fd34b33366aa00;p=chaz%2Fopenbox

rendering fixups for submenu bullets
---

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 42c7f965..8759a1b9 100644
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -126,16 +126,25 @@ void menu_entry_render(ObMenuEntry *self)
 
     XMoveResizeWindow(ob_display, self->item, 0, self->y,
                       menu->size.width, menu->item_h);
-    XMoveResizeWindow(ob_display, self->submenu_pic, menu->size.width - ob_rr_theme->bevel - 1, self->y,
-                      8, 8);
+    if (s) {
+        XMoveResizeWindow(ob_display, self->submenu_pic,
+                          menu->size.width -
+                          menu->bullet_w + (menu->bullet_w - 8) / 2,
+                          self->y + (menu->item_h - 8) / 2,
+                          8, 8);
+        XMapWindow(ob_display, self->submenu_pic);
+    } else
+        XUnmapWindow(ob_display, self->submenu_pic);
+
     a->surface.parent = menu->a_items;
     a->surface.parentx = 0;
     a->surface.parenty = self->y;
 
     if (s) {
         s->surface.parent = a;
-        s->surface.parentx = menu->size.width - 8;
-        s->surface.parenty = 0;
+        s->surface.parentx = menu->size.width -
+            menu->bullet_w + (menu->bullet_w - 8) / 2,
+        s->surface.parenty = (menu->item_h - 8) / 2;
     }
 
     RrPaint(a, self->item, menu->size.width, menu->item_h);
diff --git a/render/theme.c b/render/theme.c
index edf4b11e..51a22703 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -245,7 +245,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
     if (!read_color(db, inst,
                     "menu.bullet.picColor", &theme->menu_color))
-        theme->menu_bullet_color = RrColorNew(inst, 0x00, 0x00, 0x00);
+        theme->menu_bullet_color = RrColorNew(inst, 0, 0, 0);
     if (!read_color(db, inst,
                     "menu.frame.disableColor", &theme->menu_disabled_color))
         theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
@@ -398,10 +398,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     }
 
     if (!read_mask(inst, "bullet.xbm", theme, &theme->menu_bullet_mask)) {
-        unsigned char data[] =
-            { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 };
-        theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8,
-                                                  (gchar *)data);
+        char data[] = { 0x18, 0x30, 0x60, 0xfe, 0xfe, 0x60, 0x30, 0x18 };
+        theme->menu_bullet_mask = RrPixmapMaskNew(inst, 8, 8, data);
     }
 
     /* read the decoration textures */
@@ -765,6 +763,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_focused_unpressed_iconify->texture[0].data.mask.mask = 
         theme->a_unfocused_unpressed_iconify->texture[0].data.mask.mask = 
         theme->iconify_mask;
+    theme->a_menu_bullet->texture[0].data.mask.mask = 
+        theme->menu_bullet_mask;
     theme->a_disabled_focused_max->texture[0].data.mask.color = 
         theme->a_disabled_focused_close->texture[0].data.mask.color = 
         theme->a_disabled_focused_desk->texture[0].data.mask.color = 
@@ -821,6 +821,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_pressed_shade->texture[0].data.mask.color = 
         theme->a_unfocused_pressed_iconify->texture[0].data.mask.color =
         theme->titlebut_unfocused_pressed_color;
+    theme->a_menu_bullet->texture[0].data.mask.color = 
+        theme->menu_bullet_color;
 
     XrmDestroyDatabase(db);