diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-07 14:07:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 14:45:46 +0100 |
| commit | 3061730c2a3df6432f773c4eb481c5e6e35ec14a (patch) | |
| tree | c75b21495a093322c1ab0f5d0bba7f41009ab4ef /src/plugins/platforms/cocoa | |
| parent | 28cf5ae000de36cd6ad0df942c2f99bfa7e22129 (diff) | |
| parent | fef6b31b994befac0ee14391572ebc2b9b33e104 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.mm
Change-Id: I11c5f8466c5b51e13e5ef6a8fc6e3f2dd79122a7
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index 1345295ef5..0ffb945863 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -46,9 +46,11 @@ #include <QtCore/private/qthread_p.h> #include <QtGui/private/qguiapplication_p.h> #include "qcocoaapplication.h" +#include "qcocoaintegration.h" #include "qcocoamenuloader.h" #include "qcocoamenubar.h" #include "qcocoawindow.h" +#include "qcocoascreen.h" #import "qnsview.h" QT_BEGIN_NAMESPACE @@ -584,8 +586,9 @@ void QCocoaMenu::showPopup(const QWindow *parentWindow, const QRect &targetRect, [popupCell setMenu:m_nativeMenu]; [popupCell selectItem:nsItem]; - int availableHeight = screen->availableSize().height(); - const QPoint &globalPos = parentWindow->mapToGlobal(pos); + QCocoaScreen *cocoaScreen = static_cast<QCocoaScreen *>(screen->handle()); + int availableHeight = cocoaScreen->availableGeometry().height(); + const QPoint &globalPos = cocoaWindow->mapToGlobal(pos); int menuHeight = m_nativeMenu.size.height; if (globalPos.y() + menuHeight > availableHeight) { // Maybe we need to fix the vertical popup position but we don't know the |