remove non-planar surfaces

[chaz/openbox] / openbox / menu_render.c

diff --git a/openbox/menu_render.c b/openbox/menu_render.c
index 6a95fcbb0a792adba11d9e5225cd192ff1358d72..fcaf6869c0cd39a15e961b9c9ad1de76019d7f11 100644 (file)
--- a/openbox/menu_render.c
+++ b/openbox/menu_render.c
@@ -62,7 +62,8 @@ void menu_render_full(Menu *self) {
     items_h = self->item_h * MAX(nitems, 1);
 
     if (self->label) {
-       RECT_SET(self->a_title->area, 0, 0, self->size.width, self->title_h);
+       RECT_SET(self->a_title->area, 0, 0, self->size.width, 
+                self->title_h);
        RECT_SET(self->a_title->texture[0].position, 0, 0, self->size.width,
                 self->title_h);
     }
@@ -74,8 +75,10 @@ void menu_render_full(Menu *self) {
     if (self->label)
        XMoveResizeWindow(ob_display, self->title, -theme_bwidth,
                          -theme_bwidth, self->size.width, self->title_h);
-    XMoveResizeWindow(ob_display, self->items, 0, self->title_h + theme_bwidth,
-                      self->size.width, items_h);
+
+    XMoveResizeWindow(ob_display, self->items, 0, 
+                     self->title_h + theme_bwidth, self->size.width, 
+                     items_h);
 
     if (self->label)
        paint(self->title, self->a_title);
@@ -130,9 +133,9 @@ void menu_entry_render(MenuEntry *self)
 
     XMoveResizeWindow(ob_display, self->item, 0, self->y,
                       menu->size.width, menu->item_h);
-    a->surface.data.planar.parent = menu->a_items;
-    a->surface.data.planar.parentx = 0;
-    a->surface.data.planar.parenty = self->y;
+    a->surface.parent = menu->a_items;
+    a->surface.parentx = 0;
+    a->surface.parenty = self->y;
 
     paint(self->item, a);
 }