add misc.h with some standard enumerations with proper prefixing and capitalizations.

[chaz/openbox] / openbox / menu_render.c

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 87ffa9136061e44e86c47700a475df452cf0d70a..deebfd8999541a70171e57e6ca7c0fe44b1eca4d 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;
@@ -79,8 +76,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 + ob_rr_theme->bwidth, 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,
@@ -101,7 +98,6 @@ void menu_render_full(Menu *self) {
         item_y += self->item_h;
     }
     
-    self->size.height = item_y;
     self->invalid = FALSE;
 }
 
@@ -134,6 +130,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);