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 d3b0e0169fac3d976c4df7950accd82b3114aad1..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;
@@ -29,10 +26,12 @@ void menu_render_full(Menu *self) {
     if (self->a_title == NULL) {
         XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth);
         XSetWindowBackground(ob_display, self->frame,
-                             ob_rr_theme->b_color->pixel);
+                             RrColorPixel(ob_rr_theme->b_color));
         XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth);
-        XSetWindowBorder(ob_display, self->frame, ob_rr_theme->b_color->pixel);
-        XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
+        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);