From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 14 Sep 2005 17:40:47 +0000 (+0000)
Subject: maybe i should have tried opening a submenu too
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=9609c7f5ecadc488c450433925921ee2de44f033;p=chaz%2Fopenbox

maybe i should have tried opening a submenu too
---

diff --git a/openbox/menu.c b/openbox/menu.c
index 33a70b54..3db8e822 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -306,7 +306,6 @@ void menu_show(gchar *name, gint x, gint y, ObClient *client)
     else
         menu_frame_move(frame,
                         x - ob_rr_theme->bwidth, y - ob_rr_theme->bwidth);
-    frame->monitor = 0;
     for (i = 0; i < screen_num_monitors; ++i) {
         Rect *a = screen_physical_area_monitor(i);
         if (RECT_CONTAINS(*a, frame->area.x, frame->area.y)) {
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 43d40585..1362d963 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -605,6 +605,7 @@ gboolean menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent)
     }
 
     if (parent) {
+        self->monitor = parent->monitor;
         if (parent->child)
             menu_frame_hide(parent->child);
         parent->child = self;