mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-16 19:04:43 +03:00
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
|
From cf6881c03d9f08c6ace83defe461423bb87f30d8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?utf8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@theqtcompany.com>
|
||
|
|
Date: Fri, 15 Jan 2016 14:15:51 +0100
|
||
|
|
Subject: [PATCH] OS X: Ensure system tray icon is prepared even when menu bar
|
||
|
|
is hidden
|
||
|
|
|
||
|
|
On OS X 10.11 (El Capitan) the system menu bar can be automatically
|
||
|
|
hidden, in which case the menu bar height is reported to be 0 when
|
||
|
|
using the menuBarHeight API.
|
||
|
|
|
||
|
|
This resulted in failing to prepare an image for the system tray
|
||
|
|
icon item, making the tray item "invisible".
|
||
|
|
|
||
|
|
Instead we now use the [[NSStatusBar systemStatusBar] thickness]
|
||
|
|
API, which returns the correct height regardless of the menu bar
|
||
|
|
being hidden or not.
|
||
|
|
|
||
|
|
Task-number: QTBUG-48960
|
||
|
|
Change-Id: I208fb8df13754964a6f254cadfbff06dd56c6bab
|
||
|
|
---
|
||
|
|
src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||
|
|
index a3ffb5b..8152c57 100644
|
||
|
|
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||
|
|
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||
|
|
@@ -198,7 +198,7 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
|
||
|
|
// current OS X versions is 22 points. Provide some future-proofing
|
||
|
|
// by deriving the icon height from the menu height.
|
||
|
|
const int padding = 4;
|
||
|
|
- const int menuHeight = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
|
||
|
|
+ const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
|
||
|
|
const int maxImageHeight = menuHeight - padding;
|
||
|
|
|
||
|
|
// Select pixmap based on the device pixel height. Ideally we would use
|
||
|
|
--
|
||
|
|
2.6.2.2.g1b5ffa3
|
||
|
|
|