No longer assume status bar height, calculate, fixing notch borking

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 707609612342c29c4e79622e4134e7cb7515c845..263a919725b8e66a21243799a0006580610c6e7b 100644 (file)
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -389,8 +389,9 @@ QRect Systray::taskbarGeometry() const
     return tbRect;
 #elif defined(Q_OS_MACOS)
     // Finder bar is always 22px height on macOS (when treating as effective pixels)
-    auto screenWidth = currentScreenRect().width();
-    return {0, 0, screenWidth, 22};
+    const auto screenWidth = currentScreenRect().width();
+    const auto statusBarHeight = static_cast<int>(OCC::statusBarThickness());
+    return {0, 0, screenWidth, statusBarHeight};
 #else
     if (taskbarOrientation() == TaskBarPosition::Bottom || taskbarOrientation() == TaskBarPosition::Top) {
         auto screenWidth = currentScreenRect().width();

diff --git a/src/gui/systray.h b/src/gui/systray.h
index 31251d01e2886f7799f6adac5004736f99683cd4..6b63d6797cb6303d38438884b8767781bae2e040 100644 (file)
--- a/src/gui/systray.h
+++ b/src/gui/systray.h
@@ -42,6 +42,7 @@ public:
 bool canOsXSendUserNotification();
 void sendOsXUserNotification(const QString &title, const QString &message);
 void setTrayWindowLevelAndVisibleOnAllSpaces(QWindow *window);
+double statusBarThickness();
 #endif
 
 /**

diff --git a/src/gui/systray.mm b/src/gui/systray.mm
index a4d35eb23773005697034b72842bc917eba7ee38..544455c16e6402122a90fca97857c12aa3077bb8 100644 (file)
--- a/src/gui/systray.mm
+++ b/src/gui/systray.mm
@@ -17,6 +17,11 @@
 
 namespace OCC {
 
+double statusBarThickness()
+{
+    return [NSStatusBar systemStatusBar].thickness;
+}
+
 bool canOsXSendUserNotification()
 {
     return NSClassFromString(@"NSUserNotificationCenter") != nil;