diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-26 20:55:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-26 20:55:01 +0100 |
| commit | 32da9ae38969c2e4f01968401339433e7909eed8 (patch) | |
| tree | afe1b708d2dd22fcda239d8a9808468e3d84d931 /src/plugins/platforms/cocoa | |
| parent | 8a9f77ead179ce88df5113290fa0201872fcd74e (diff) | |
| parent | b2d2b655e58d5337765c26dafa836b12e019c6a4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I5a919ac999c4c5a3ca2024b63a78c094a44a1191
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm index 0b1e186bce..d3aafa3785 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm @@ -84,6 +84,8 @@ #include "qt_mac_p.h" #include "qcocoahelpers.h" +#include "qcocoaintegration.h" +#include "qcocoascreen.h" #include <QtGui/private/qcoregraphics_p.h> #import <AppKit/AppKit.h> @@ -383,9 +385,8 @@ QT_END_NAMESPACE - (QRectF)geometry { if (NSWindow *window = [[item view] window]) { - NSRect screenRect = [[window screen] frame]; - NSRect windowRect = [window frame]; - return QRectF(windowRect.origin.x, screenRect.size.height-windowRect.origin.y-windowRect.size.height, windowRect.size.width, windowRect.size.height); + if (QCocoaScreen *screen = QCocoaIntegration::instance()->screenForNSScreen([window screen])) + return screen->mapFromNative([window frame]); } return QRectF(); } |