diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 10:51:35 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-02-14 19:43:02 +0100 |
| commit | 1124d1036984f920dcd5b2caec9ff8fe2d788b8a (patch) | |
| tree | 6e0c626f33ee58e5888ceb4a11608f2103a34d16 /openbox/menuframe.c | |
| parent | bbf0eed8d146602e81e64e9bc6d1c451c260b52f (diff) | |
| parent | f1f61ff703db72cc1db7f834c9cb45616d55da10 (diff) | |
Merge branch 'backport' into work
Diffing against the old work branch where most of the changes
in backport were cherry-picked from indicates this should be
alright. (0de9097017d4d1991388a35e380a57dc1135b431)
Diffstat (limited to 'openbox/menuframe.c')
| -rw-r--r-- | openbox/menuframe.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c index c25e485f..730f23f7 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -254,23 +254,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, |