all repos — openbox @ d61edbe2190ab05fdb305b01e70b29904287ab77

openbox fork - make it a bit more like ryudo 

fix the offsets used to keep the menus on screen
Dana Jansens danakj@orodu.net
commit

d61edbe2190ab05fdb305b01e70b29904287ab77

parent

948c549d9df7c1bf54e8ae487cb96a9ae413c2cf

1 files changed, 7 insertions(+), 5 deletions(-)

jump to
M openbox/menu.c → openbox/menu.c 
@@ -20,6 +20,8 @@ #define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask)
 #define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
                          ButtonPressMask | ButtonReleaseMask)
 
+void menu_control_show(ObMenu *self, int x, int y, ObClient *client);
+
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                        gpointer data)
 {

@@ -105,8 +107,6 @@ parse_menu_fail:
     g_free(id);
     g_free(title);
 }
-
-void menu_control_show(ObMenu *self, int x, int y, ObClient *client);
 
 void menu_destroy_hash_key(ObMenu *menu)
 {

@@ -523,11 +523,12 @@ self->submenu->update(self->submenu);
 
             a = screen_physical_area_monitor(self->parent->xin_area);
 
-	    if (self->submenu->size.width + x >= a->x + a->width) {
+	    if (self->submenu->size.width + x + ob_rr_theme->bwidth >=
+                a->x + a->width) {
                 int newparentx = a->x + a->width
                     - self->submenu->size.width
                     - self->parent->size.width
-                    - ob_rr_theme->bwidth
+                    - ob_rr_theme->bwidth * 2
                     - ob_rr_theme->menu_overlap;
                 
                 x = a->x + a->width - self->submenu->size.width

@@ -540,7 +541,8 @@ self->parent->location.y, self->parent->client);
             }
 	    
 	    menu_show_full(self->submenu, x,
-			   self->parent->location.y + self->y,
+			   self->parent->location.y + self->y +
+                           self->parent->title_h + ob_rr_theme->bwidth,
                            self->parent->client);
 	}
         self->hilite = TRUE;