From bfc7b27900dd0b4f1f68089d3a0e57d5c33380ca Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Thu, 23 Jun 2022 16:43:22 +0800
Subject: [PATCH] macos: minor improvements

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
---
 src/core/framelesshelper_qt.cpp | 16 +++++++++++++++-
 src/core/utils_mac.mm           |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/core/framelesshelper_qt.cpp b/src/core/framelesshelper_qt.cpp
index 0da8922..6c24057 100644
--- a/src/core/framelesshelper_qt.cpp
+++ b/src/core/framelesshelper_qt.cpp
@@ -28,6 +28,7 @@
 #include <QtGui/qwindow.h>
 #include "framelessmanager.h"
 #include "framelessmanager_p.h"
+#include "framelessconfig_p.h"
 #include "utils.h"
 
 FRAMELESSHELPER_BEGIN_NAMESPACE
@@ -73,7 +74,20 @@ void FramelessHelperQt::addWindow(const SystemParameters &params)
     data.eventFilter = new FramelessHelperQt(window);
     g_qtHelper()->data.insert(windowId, data);
     g_qtHelper()->mutex.unlock();
-    params.setWindowFlags(params.getWindowFlags() | Qt::FramelessWindowHint);
+    const bool shouldApplyFramelessFlag = [&params]() -> bool {
+#ifdef Q_OS_MACOS
+        if (FramelessConfig::instance()->isSet(Option::WindowUseRoundCorners)
+            && (params.getCurrentApplicationType() == ApplicationType::Quick)) {
+            return false;
+        }
+#else
+        Q_UNUSED(params);
+#endif
+        return true;
+    }();
+    if (shouldApplyFramelessFlag) {
+        params.setWindowFlags(params.getWindowFlags() | Qt::FramelessWindowHint);
+    }
     window->installEventFilter(data.eventFilter);
 #ifdef Q_OS_MACOS
     Utils::setSystemTitleBarVisible(windowId, false);
diff --git a/src/core/utils_mac.mm b/src/core/utils_mac.mm
index d8d63a5..6b0ed5f 100644
--- a/src/core/utils_mac.mm
+++ b/src/core/utils_mac.mm
@@ -163,6 +163,7 @@ public:
             return;
         }
         nsview.wantsLayer = YES;
+        nswindow.styleMask |= NSWindowStyleMaskResizable;
         if (visible) {
             nswindow.styleMask &= ~NSWindowStyleMaskFullSizeContentView;
         } else {