X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=0fba250a06d1ba6215298686f150e142dadc27d9;hb=cbbda7a363e0be925072c77b521af5546b9d5da1;hp=30c332ce344322b51bf45abff7fa8b455a64c58c;hpb=59c5d1cc4e9d149510c62af16354ebd172452f48;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 30c332ce..0fba250a 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -193,13 +193,8 @@ void menu_frame_place_topmenu(ObMenuFrame *self, gint x, gint y) x = self->client->frame->area.x + self->client->frame->size.left; y = self->client->frame->area.y + self->client->frame->size.top; } else { - if (config_menu_middle) { - x -= self->area.width / 2; - y -= self->title_h*3/4; - } else { - x -= ob_rr_theme->mbwidth; - y -= ob_rr_theme->mbwidth; - } + x -= self->area.width / 2; + y -= ob_rr_theme->mbwidth + self->title_h; } menu_frame_move(self, x, y); } @@ -210,19 +205,20 @@ void menu_frame_place_submenu(ObMenuFrame *self) gint overlap; gint bwidth; - overlap = (config_menu_middle ? 0 : ob_rr_theme->menu_overlap); + overlap = ob_rr_theme->menu_overlap; bwidth = ob_rr_theme->mbwidth; - if (self->direction_right) x = self->parent->area.x + self->parent->area.width - overlap - bwidth; else x = self->parent->area.x - self->area.width + overlap + bwidth; y = self->parent->area.y + self->parent->title_h + - self->parent_entry->area.y + overlap; + self->parent_entry->area.y; if (config_menu_middle) - y = y - self->area.height/2 + self->item_h/2; + y -= (self->area.height - (bwidth * 2) - self->item_h) / 2; + else + y += overlap; menu_frame_move(self, x, y); }