From a12fdc3c6de4653ef3b00f75161b83ea77083039 Mon Sep 17 00:00:00 2001
From: Alex Spataru <alex_spataru@outlook.com>
Date: Thu, 25 Nov 2021 02:31:44 -0600
Subject: [PATCH] Let macOS WM draw frameless window shadow

---
 assets/qml/FramelessWindow/CustomWindow.qml | 36 +++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/assets/qml/FramelessWindow/CustomWindow.qml b/assets/qml/FramelessWindow/CustomWindow.qml
index ec9754ae..b7132db9 100644
--- a/assets/qml/FramelessWindow/CustomWindow.qml
+++ b/assets/qml/FramelessWindow/CustomWindow.qml
@@ -42,7 +42,7 @@ Window {
     // Window radius control
     //
     property int borderWidth: 2
-    readonly property int handleSize: radius > 0 ? radius + 10 + shadowMargin : 0
+    readonly property int handleSize: radius > 0 ? radius + 10 : 0
     readonly property int radius: ((root.visibility === Window.Maximized && maximizeEnabled) || isFullscreen) ? 0 : 10
 
     //
@@ -54,12 +54,29 @@ Window {
     property bool isMinimized: false
     property alias showIcon: _title.showIcon
     property alias isFullscreen: _title.isFullscreen
-    readonly property int customFlags: Qt.Window |
-                                       Qt.CustomizeWindowHint |
-                                       Qt.FramelessWindowHint |
-                                       Qt.WindowSystemMenuHint |
-                                       Qt.NoDropShadowWindowHint |
-                                       Qt.WindowMinMaxButtonsHint
+    readonly property int customFlags: {
+        // Setup frameless window flags
+        var flags = Qt.Window |
+                    Qt.CustomizeWindowHint |
+                    Qt.FramelessWindowHint |
+                    Qt.WindowSystemMenuHint |
+                    Qt.WindowMinMaxButtonsHint
+
+        //
+        // The macOS window manager is able to generate shadows for Qt frameless
+        // windows. Other operating systems have varied mileage, so we draw the
+        // shadow ourselves to avoid ugly surprises.
+        //
+        // Also, disabling the custom shadow on macOS is a good idea so that users can
+        // move the window freely over all the desktop without being blocked by the
+        // menubar or dock due to the custom shadow border.
+        //
+        if (!Cpp_IsMac)
+            flags |= Qt.NoDropShadowWindowHint
+
+        // Return "calculated" window flags
+        return flags
+    }
 
     //
     // Toggle fullscreen state
@@ -80,7 +97,7 @@ Window {
     //
     // Size of the shadow object
     //
-    property int shadowMargin: root.radius > 0 ? 20 : 0
+    property int shadowMargin: Cpp_IsMac ? 0 : (root.radius > 0 ? 20 : 0)
 
     //
     // Titlebar left/right margins for custom controls
@@ -134,7 +151,8 @@ Window {
     }
 
     //
-    // Shadow implementation
+    // Custom shadow implementation for non-macOS systems. The shadow shall be disabled
+    // when the window is maximized.
     //
     Widgets.Shadow {
         opacity: 0.2