From 2dbb73b54b0efe50f252e086b63d77e04fd8a2b2 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Date: Tue, 16 Apr 2013 13:46:03 +0200
Subject: Cocoa: Fix menu popup, again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This time, popUpContextMenu:withEvent:forView: wouldn't respect the
menu's minimum width setting.

Change-Id: I7731851f2cf45d596d45a24dab5abe7b9239f07f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---
 src/plugins/platforms/cocoa/qcocoamenu.mm | 66 ++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 28 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm
index 5bd3a31427..732851ecf7 100644
--- a/src/plugins/platforms/cocoa/qcocoamenu.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenu.mm
@@ -307,6 +307,8 @@ void QCocoaMenu::setVisible(bool visible)
 
 void QCocoaMenu::showPopup(const QWindow *parentWindow, QPoint pos, const QPlatformMenuItem *item)
 {
+    QCocoaAutoReleasePool pool;
+
     QCocoaWindow *cocoaWindow = parentWindow ? static_cast<QCocoaWindow *>(parentWindow->handle()) : 0;
     NSView *view = cocoaWindow ? cocoaWindow->contentView() : nil;
     NSMenuItem *nsItem = item ? ((QCocoaMenuItem *)item)->nsItem() : nil;
@@ -315,36 +317,44 @@ void QCocoaMenu::showPopup(const QWindow *parentWindow, QPoint pos, const QPlatf
     // However, this showed not to work with modal windows where the menu items
     // would appear disabled. So, we resort to a more artisanal solution. Note
     // that this implies several things.
-    //
-    // First, we need to transform 'pos' to window or screen coordinates.
-    NSPoint nsPos = NSMakePoint(pos.x() - 1, pos.y());
-    if (view) {
-        nsPos.y = view.frame.size.height - nsPos.y;
-    } else if (!QGuiApplication::screens().isEmpty()) {
-        QScreen *screen = QGuiApplication::screens().at(0);
-        nsPos.y = screen->availableVirtualSize().height() - nsPos.y;
-    }
     if (nsItem) {
-        // Then, we need to position the menu ourselves to have the specified item
-        // at the specified position. This also means that we have to guess the menu
-        // item's height. (We could use HITheme to get it, but it looks like an overkill
-        // at this point).
-        CGFloat itemHeight = m_nativeMenu.font.pointSize == 13 ? 18.0 : 19.0;
-        nsPos.y += [m_nativeMenu indexOfItem:nsItem] * itemHeight;
+        // If we want to position the menu popup so that a specific item lies under
+        // the mouse cursor, we resort to NSPopUpButtonCell to do that. This is the
+        // typical use-case for a choice list, or non-editable combobox. We can't
+        // re-use the popUpContextMenu:withEvent:forView: logic below since it won't
+        // respect the menu's minimum width.
+        NSPopUpButtonCell *popupCell = [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO];
+        [popupCell setAltersStateOfSelectedItem:NO];
+        [popupCell setTransparent:YES];
+        [popupCell setMenu:m_nativeMenu];
+        [popupCell selectItem:nsItem];
+        NSRect cellFrame = NSMakeRect(pos.x(), pos.y(), m_nativeMenu.minimumWidth, 10);
+        [popupCell performClickWithFrame:cellFrame inView:view];
+    } else {
+        // Else, we need to transform 'pos' to window or screen coordinates.
+        NSPoint nsPos = NSMakePoint(pos.x() - 1, pos.y());
+        if (view) {
+            nsPos.y = view.frame.size.height - nsPos.y;
+        } else if (!QGuiApplication::screens().isEmpty()) {
+            QScreen *screen = QGuiApplication::screens().at(0);
+            nsPos.y = screen->availableVirtualSize().height() - nsPos.y;
+        }
+
+        // Finally, we need to synthesize an event.
+        NSEvent *menuEvent = [NSEvent mouseEventWithType:NSRightMouseDown
+                location:nsPos
+                modifierFlags:0
+                timestamp:0
+                windowNumber:view ? view.window.windowNumber : 0
+                                    context:nil
+                                    eventNumber:0
+                                    clickCount:1
+                                    pressure:1.0];
+        NSSize size = m_nativeMenu.size;
+        [NSMenu popUpContextMenu:m_nativeMenu withEvent:menuEvent forView:view];
     }
-    // Last, we need to synthesize an event.
-    NSEvent *menuEvent = [NSEvent mouseEventWithType:NSRightMouseDown
-                                            location:nsPos
-                                       modifierFlags:0
-                                           timestamp:0
-                                        windowNumber:view ? view.window.windowNumber : 0
-                                             context:nil
-                                         eventNumber:0
-                                          clickCount:1
-                                            pressure:1.0];
-    [NSMenu popUpContextMenu:m_nativeMenu withEvent:menuEvent forView:view];
-
-    // The call above blocks, and also swallows any mouse release event,
+
+    // The calls above block, and also swallow any mouse release event,
     // so we need to clear any mouse button that triggered the menu popup.
     if ([view isKindOfClass:[QNSView class]])
         [(QNSView *)view resetMouseButtons];
-- 
cgit v1.2.3