summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2008-02-11 22:10:21 -0500
committerMikael Magnusson <mikachu@comhem.se>2008-02-14 19:40:02 +0100
commit8186a81fe0095a46c2a65e252268f19d5798095a (patch)
treebb91f3124608f0631f9519586c48a9dda7689764 /openbox
parent6bda8c29038649f4bd4c54ce011473b1344bb291 (diff)
split menu overlap into x and y components
Diffstat (limited to 'openbox')
-rw-r--r--openbox/menuframe.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index fb9b6c5b..3bbf1be2 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -249,23 +249,24 @@ static void menu_frame_place_topmenu(ObMenuFrame *self, gint *x, gint *y)
static void menu_frame_place_submenu(ObMenuFrame *self, gint *x, gint *y)
{
- gint overlap;
+ gint overlapx, overlapy;
gint bwidth;
- overlap = ob_rr_theme->menu_overlap;
+ overlapx = ob_rr_theme->menu_overlap_x;
+ overlapy = ob_rr_theme->menu_overlap_y;
bwidth = ob_rr_theme->mbwidth;
if (self->direction_right)
*x = self->parent->area.x + self->parent->area.width -
- overlap - bwidth;
+ overlapx - bwidth;
else
- *x = self->parent->area.x - self->area.width + overlap + bwidth;
+ *x = self->parent->area.x - self->area.width + overlapx + bwidth;
*y = self->parent->area.y + self->parent_entry->area.y;
if (config_menu_middle)
*y -= (self->area.height - (bwidth * 2) - ITEM_HEIGHT) / 2;
else
- *y += overlap;
+ *y += overlapy;
}
void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,