prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / menu_render.c

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 2ca1c77392af215ec9eb4163205e77f560242194..4b6e7d8fbd9a153d682156be32f947c070233935 100644 (file)
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -7,15 +7,12 @@
 void menu_render_full(Menu *self);
 
 void menu_render(Menu *self) {
-    if (self->invalid) {
-       if (self->update) {
-           self->update(self);
-       } else {
-           menu_render_full(self);
-       }
+    if (self->update) {
+        self->update(self);
+    } else if (self->invalid) {
+        menu_render_full(self);
     }
 }
-           
 
 void menu_render_full(Menu *self) {
     GList *it;
@@ -26,6 +23,20 @@ void menu_render_full(Menu *self) {
     self->size.width = 1;
     self->item_h = 1;
 
+    if (self->a_title == NULL) {
+        XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth);
+        XSetWindowBackground(ob_display, self->frame,
+                             RrColorPixel(ob_rr_theme->b_color));
+        XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
+        XSetWindowBorder(ob_display, self->frame,
+                         RrColorPixel(ob_rr_theme->b_color));
+        XSetWindowBorder(ob_display, self->title,
+                         RrColorPixel(ob_rr_theme->b_color));
+
+        self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title);
+        self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu);
+    }
+    
     /* set texture data and size them mofos out */
     if (self->label) {
        self->a_title->texture[0].data.text.string = self->label;
@@ -39,6 +50,12 @@ void menu_render_full(Menu *self) {
         MenuEntry *e = it->data;
         int h;
 
+        if (e->a_item == NULL) {
+            e->a_item = RrAppearanceCopy(ob_rr_theme->a_menu_item);
+            e->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled);
+            e->a_hilite = RrAppearanceCopy(ob_rr_theme->a_menu_hilite);
+        }
+
         e->a_item->texture[0].data.text.string = e->label;
         RrMinsize(e->a_item, &e->min_w, &self->item_h);
         self->size.width = MAX(self->size.width, e->min_w);
@@ -61,8 +78,8 @@ void menu_render_full(Menu *self) {
     self->item_h += ob_rr_theme->bevel * 2;
     items_h = self->item_h * MAX(nitems, 1);
 
-    XResizeWindow(ob_display, self->frame, self->size.width,
-                 MAX(self->title_h + items_h, 1));
+    self->size.height = MAX(self->title_h + items_h + ob_rr_theme->bwidth, 1);
+    XResizeWindow(ob_display, self->frame, self->size.width,self->size.height);
     if (self->label)
        XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth,
                          -ob_rr_theme->bwidth,
@@ -83,7 +100,6 @@ void menu_render_full(Menu *self) {
         item_y += self->item_h;
     }
     
-    self->size.height = item_y;
     self->invalid = FALSE;
 }
 
@@ -116,6 +132,7 @@ void menu_entry_render(MenuEntry *self)
          self->a_hilite : self->a_item);
        break;
     }
+    g_message ("%s %d", self->label, self->hilite);
 
     XMoveResizeWindow(ob_display, self->item, 0, self->y,
                       menu->size.width, menu->item_h);