In horizontal menu bars, make it possible to leave a dropdown menu and open another

[probonopd]

In horizontal menu bars, make it possible to leave a dropdown menu and open another without having to click for a second time.

To reproduce:

• Run a system with a horizontal menu bar (e.g., Gershwin)
• Click on e.g., Edit, let the mouse go, move cursor down to "Copy"
• Move cursor over another menu title

The Edit menu should close and the other menu should open. It doesn't.

cc @pkgdemon

[probonopd]

This works for me:

diff --git a/Source/NSMenu.m b/Source/NSMenu.m
index 22a758c4..80a02086 100644
--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@@ -2057,8 +2057,15 @@ static BOOL menuBarVisible = YES;
         {
           [[self window] setTitle: [[NSProcessInfo processInfo] processName]];
           [[self window] setLevel: NSMainMenuWindowLevel];
-          [self _setGeometry];
+          /* sizeToFit must run first so that [_aWindow frame].size.height
+           * is non-zero when _setGeometry uses it to place the bar at the
+           * top of the screen.  Without this ordering, external Menu.app
+           * mode (which never calls -display) leaves the window frame at
+           * {0,0,w,h} instead of the correct top-of-screen position,
+           * breaking the NSMouseInRect re-entry check in
+           * _trackWithEvent:startingMenuView: (step 3a). */
           [self sizeToFit];
+          [self _setGeometry];
 
           if ([NSApp isActive])
             {
diff --git a/Source/NSMenuView.m b/Source/NSMenuView.m
index d1591986..d6a4119c 100644
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@@ -1784,24 +1784,36 @@ static float menuBarHeight = 0.0;
                   // If the user moves the mouse into the main window
                   // horizontal menu, start tracking again.
                   NSWindow *mainWindow = [mainWindowMenuView window];
-                  NSPoint locationInMainWindow = [mainWindow 
-                    convertScreenToBase: locationInScreenCoordinates];
-		  if ([mainWindowMenuView 
-                        hitTest: locationInMainWindow] != nil)
-		    {
-                      int index = [mainWindowMenuView indexOfItemAtPoint: 
-                        [mainWindowMenuView 
-                          convertPoint: locationInMainWindow
-                              fromView: nil]];
-                      if (index != -1 &&
-                          index != [mainWindowMenuView highlightedItemIndex])
-                        {
-		          [self setHighlightedItemIndex: -1];
-		          return [mainWindowMenuView
-                                   _trackWithEvent: original
-                                   startingMenuView: mainWindowMenuView];
-                        }
-		    }
+                  /* Guard against the embedded menu view having been
+                   * removed from its host window (e.g. when external
+                   * Menu.app mode calls updateAllWindowsWithMenu:nil
+                   * while tracking is already in progress).  Without
+                   * this check, [nil convertScreenToBase:] returns
+                   * NSZeroPoint and hitTest: may yield a false positive,
+                   * causing spurious re-entry into menu-bar tracking. */
+                  if (mainWindow != nil
+                      && NSMouseInRect (locationInScreenCoordinates,
+                                        [mainWindow frame], NO))
+                    {
+                      NSPoint locationInMainWindow = [mainWindow 
+                        convertScreenToBase: locationInScreenCoordinates];
+		      if ([mainWindowMenuView 
+                            hitTest: locationInMainWindow] != nil)
+		        {
+                          int index = [mainWindowMenuView indexOfItemAtPoint: 
+                            [mainWindowMenuView 
+                              convertPoint: locationInMainWindow
+                                  fromView: nil]];
+                          if (index != -1 &&
+                              index != [mainWindowMenuView highlightedItemIndex])
+                            {
+		              [self setHighlightedItemIndex: -1];
+		              return [mainWindowMenuView
+                                       _trackWithEvent: original
+                                       startingMenuView: mainWindowMenuView];
+                            }
+		        }
+                    }
 		}
             }
 
@@ -1949,11 +1961,15 @@ static float menuBarHeight = 0.0;
   [nc postNotificationName: NSMenuDidBeginTrackingNotification
                     object: [self menu]];
  
-  if (NSInterfaceStyleForKey(@"NSMenuInterfaceStyle", self) ==
-      NSWindows95InterfaceStyle &&
-      ![[self menu] isTransient] &&
-      ![[self menu] _ownedByPopUp])
-    {
+  if ([self isHorizontal] == YES
+      && ![[self menu] isTransient]
+      && ![[self menu] _ownedByPopUp])
+    {
+      /* Keep the root horizontal menu view available while tracking any
+       * attached submenu so moving back over the bar can switch directly to
+       * another top-level menu without requiring a second click.  This is
+       * needed for both in-window menus and the hidden menu-bar window used
+       * by external Menu.app mode. */
       mainWindowMenuView = self;
     }

[DTW-Thalion]

Testing this on current git with a horizontal menu bar (NSMenuInterfaceStyle = NSMacintoshInterfaceStyle), the switch works. I opened the File menu, moved the pointer down into its items, then over the Edit title, and the File menu closed and Edit opened, with no second click.

That looks like it is handled by a84b42471 (5 May), which reworked the tracking so an ancestor menu is re-entered when the pointer moves back over the bar. It is later than this report and the diff above, so it seems to cover the in-window horizontal case already.

I could not set up the external Menu.app mode the diff comments mention (the global bar as used by Gershwin) here, so I only exercised the in-window bar. Could you retest on current git and say whether the Gershwin case still needs a second click? If it does, the remaining piece is likely the mainWindowMenuView = self assignment in -trackWithEvent:, which is still gated on NSWindows95InterfaceStyle rather than on isHorizontal.

cc @probonopd

[probonopd]

Testing this on current git with a horizontal menu bar (NSMenuInterfaceStyle = NSMacintoshInterfaceStyle), the switch works. I opened the File menu, moved the pointer down into its items, then over the Edit title, and the File menu closed and Edit opened, with no second click.

This does not seem to work for me still, @pkgdemon can you also try please?
Thanks!

[probonopd]

Thanks @DTW-Thalion for looking into this. In case you would like to test for yourself, you can install Gershwin by folliowing the README at https://github.com/gershwin-desktop/gershwin-developer.