From 5bfd136473edc506b860177bf88626e35a5a1ba4 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: ćšć, 28 12æ 2023 12:06:54 +0800
Subject: [PATCH] Add mac blur view
---
src/core/contexts/cocoawindowcontext.mm | 560 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 439 insertions(+), 121 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index edd2c3a..54a3dbe 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -3,80 +3,280 @@
#include <objc/runtime.h>
#include <AppKit/AppKit.h>
+#include <Cocoa/Cocoa.h>
+
#include <QtGui/QGuiApplication>
+
+#include "qwkglobal_p.h"
+#include "systemwindow_p.h"
namespace QWK {
- struct NSWindowProxy {
+ struct NSWindowProxy;
+
+ using ProxyList = QHash<WId, NSWindowProxy *>;
+ Q_GLOBAL_STATIC(ProxyList, g_proxyList);
+
+ using ProxyList2 = QHash<NSWindow *, NSWindowProxy *>;
+ Q_GLOBAL_STATIC(ProxyList2, g_proxyIndexes);
+
+}
+
+struct QWK_NSWindowDelegate {
+public:
+ virtual ~QWK_NSWindowDelegate() = default;
+ virtual void windowWillEnterFullScreen(){};
+ virtual void windowDidEnterFullScreen(){};
+ virtual void windowWillExitFullScreen(){};
+ virtual void windowDidExitFullScreen(){};
+ virtual void windowDidResize(){};
+};
+
+//
+// Objective C++ Begin
+//
+
+@interface QWK_NSWindowObserver : NSObject {
+}
+@end
+
+@implementation QWK_NSWindowObserver
+
+- (id)init {
+ self = [super init];
+ if (self) {
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowWillEnterFullScreen:)
+ name:NSWindowWillEnterFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidEnterFullScreen:)
+ name:NSWindowDidEnterFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowWillExitFullScreen:)
+ name:NSWindowWillExitFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidExitFullScreen:)
+ name:NSWindowDidExitFullScreenNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(windowDidResize:)
+ name:NSWindowDidResizeNotification
+ object:nil];
+ }
+ return self;
+}
+
+- (void)dealloc {
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+ [super dealloc];
+}
+
+- (void)windowWillEnterFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowWillEnterFullScreen();
+ }
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidEnterFullScreen();
+ }
+}
+
+- (void)windowWillExitFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowWillExitFullScreen();
+ }
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidExitFullScreen();
+ }
+}
+
+- (void)windowDidResize:(NSNotification *)notification {
+ auto nswindow = reinterpret_cast<NSWindow *>(notification.object);
+ if (auto proxy = QWK::g_proxyIndexes->value(nswindow)) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowDidResize();
+ }
+}
+
+@end
+
+//
+// Objective C++ End
+//
+
+namespace QWK {
+
+ struct NSWindowProxy : public QWK_NSWindowDelegate {
+ enum class BlurMode {
+ Dark,
+ Light,
+ None,
+ };
+
NSWindowProxy(NSWindow *macWindow) {
- if (instances.contains(macWindow)) {
+ nswindow = macWindow;
+ g_proxyIndexes->insert(nswindow, this);
+ }
+
+ ~NSWindowProxy() override {
+ if (blurEffect) {
+ setBlurEffect(BlurMode::None);
+ }
+ g_proxyIndexes->remove(nswindow);
+ }
+
+ void windowWillEnterFullScreen() override {
+ }
+
+ void windowDidEnterFullScreen() override {
+ }
+
+ void windowWillExitFullScreen() override {
+ if (systemButtonRect.isEmpty() || !systemButtonVisible)
+ return;
+
+ // The system buttons will stuck at their default positions when the exit-fullscreen
+ // animation is running, we need to hide them until the animation finishes
+ for (const auto &button : systemButtons()) {
+ button.hidden = true;
+ }
+ }
+
+ void windowDidExitFullScreen() override {
+ if (systemButtonRect.isEmpty() || !systemButtonVisible)
+ return;
+
+ for (const auto &button : systemButtons()) {
+ button.hidden = false;
+ }
+ updateSystemButtonRect();
+ }
+
+ void windowDidResize() override {
+ if (blurEffect) {
+ updateBlurEffectSize();
+ }
+
+ if (systemButtonRect.isEmpty() || !systemButtonVisible) {
return;
}
- nswindow = macWindow;
- instances.insert(macWindow, this);
- if (!windowClass) {
- windowClass = [nswindow class];
- replaceImplementations();
+ updateSystemButtonRect();
+ }
+
+ void setSystemButtonVisible(bool visible) {
+ systemButtonVisible = visible;
+ for (const auto &button : systemButtons()) {
+ button.hidden = !visible;
+ }
+
+ if (systemButtonRect.isEmpty() || !visible) {
+ return;
+ }
+ updateSystemButtonRect();
+ }
+
+ void setSystemButtonRect(const QRect &rect) {
+ systemButtonRect = rect;
+
+ if (rect.isEmpty() || !systemButtonVisible) {
+ return;
+ }
+ updateSystemButtonRect();
+ }
+
+ void updateSystemButtonRect() {
+ // https://forgetsou.github.io/2020/11/06/macos%E5%BC%80%E5%8F%91-%E5%85%B3%E9%97%AD-%E6%9C%80%E5%B0%8F%E5%8C%96-%E5%85%A8%E5%B1%8F%E5%B1%85%E4%B8%AD%E5%A4%84%E7%90%86(%E4%BB%BFMac%20QQ)/
+
+ const auto &buttons = systemButtons();
+ const auto &leftButton = buttons[0];
+ const auto &midButton = buttons[1];
+ const auto &rightButton = buttons[2];
+
+ auto spacing = midButton.frame.origin.x - leftButton.frame.origin.x;
+ auto width = midButton.frame.size.width;
+ auto height = midButton.frame.size.height;
+
+ QPoint center = systemButtonRect.center();
+
+ // Mid button
+ NSPoint centerOrigin = {
+ center.x() - width / 2,
+ center.y() - height / 2,
+ };
+ [midButton setFrameOrigin:centerOrigin];
+
+ // Left button
+ NSPoint leftOrigin = {
+ centerOrigin.x - spacing,
+ centerOrigin.y,
+ };
+ [leftButton setFrameOrigin:leftOrigin];
+
+ // Right button
+ NSPoint rightOrigin = {
+ centerOrigin.x + spacing,
+ centerOrigin.y,
+ };
+ [rightButton setFrameOrigin:rightOrigin];
+ }
+
+ inline std::array<NSButton *, 3> systemButtons() {
+ NSButton *closeBtn = [nswindow standardWindowButton:NSWindowCloseButton];
+ NSButton *minimizeBtn = [nswindow standardWindowButton:NSWindowMiniaturizeButton];
+ NSButton *zoomBtn = [nswindow standardWindowButton:NSWindowZoomButton];
+ return {closeBtn, minimizeBtn, zoomBtn};
+ }
+
+ void setBlurEffect(BlurMode option) {
+ if (option == BlurMode::None) {
+ if (!blurEffect) {
+ return;
+ }
+ [blurEffect removeFromSuperview];
+ [blurEffect release];
+ blurEffect = nil;
+ } else {
+ if (!blurEffect) {
+ NSView *const view = [nswindow contentView];
+ NSVisualEffectView *const blurView =
+ [[visualEffectViewClass alloc] initWithFrame:view.bounds];
+ blurView.material = NSVisualEffectMaterialUnderWindowBackground;
+ blurView.blendingMode = NSVisualEffectBlendingModeBehindWindow;
+ blurView.state = NSVisualEffectStateFollowsWindowActiveState;
+
+#if 1
+ const NSView *const parent = [view superview];
+ [parent addSubview:blurView positioned:NSWindowBelow relativeTo:view];
+#endif
+
+ blurEffect = blurView;
+ updateBlurEffectSize();
+ }
+
+ auto view = static_cast<const NSVisualEffectView *>(blurEffect);
+ if (option == BlurMode::Dark) {
+ view.appearance = [NSAppearance appearanceNamed:@"NSAppearanceNameVibrantDark"];
+ } else {
+ view.appearance =
+ [NSAppearance appearanceNamed:@"NSAppearanceNameVibrantLight"];
+ }
}
}
- ~NSWindowProxy() {
- instances.remove(nswindow);
- if (instances.count() <= 0) {
- restoreImplementations();
- windowClass = nil;
- }
- nswindow = nil;
- }
-
- void replaceImplementations() {
- Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
- oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(
- method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
-
- method =
- class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
- oldSetTitlebarAppearsTransparent =
- reinterpret_cast<setTitlebarAppearsTransparentPtr>(method_setImplementation(
- method, reinterpret_cast<IMP>(setTitlebarAppearsTransparent)));
-
-#if 0
- method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
- oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
-
- method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
- oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
-#endif
-
- method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
- oldSendEvent = reinterpret_cast<sendEventPtr>(
- method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
- }
-
- void restoreImplementations() {
- Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
- method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
- oldSetStyleMask = nil;
-
- method =
- class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
- method_setImplementation(method,
- reinterpret_cast<IMP>(oldSetTitlebarAppearsTransparent));
- oldSetTitlebarAppearsTransparent = nil;
-
-#if 0
- method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
- method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeKeyWindow));
- oldCanBecomeKeyWindow = nil;
-
- method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
- method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeMainWindow));
- oldCanBecomeMainWindow = nil;
-#endif
-
- method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
- method_setImplementation(method, reinterpret_cast<IMP>(oldSendEvent));
- oldSendEvent = nil;
+ void updateBlurEffectSize() {
+ const NSView *const view = [nswindow contentView];
+ blurEffect.frame = view.frame;
}
void setSystemTitleBarVisible(const bool visible) {
@@ -84,6 +284,7 @@
if (!nsview) {
return;
}
+
nsview.wantsLayer = YES;
nswindow.styleMask |= NSWindowStyleMaskResizable;
if (visible) {
@@ -107,9 +308,70 @@
#endif
}
- private:
+ static void replaceImplementations() {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ oldSetStyleMask = reinterpret_cast<setStyleMaskPtr>(
+ method_setImplementation(method, reinterpret_cast<IMP>(setStyleMask)));
+
+ method =
+ class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ oldSetTitlebarAppearsTransparent =
+ reinterpret_cast<setTitlebarAppearsTransparentPtr>(method_setImplementation(
+ method, reinterpret_cast<IMP>(setTitlebarAppearsTransparent)));
+
+#if 0
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+ oldCanBecomeKeyWindow = reinterpret_cast<canBecomeKeyWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeKeyWindow)));
+
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ oldCanBecomeMainWindow = reinterpret_cast<canBecomeMainWindowPtr>(method_setImplementation(method, reinterpret_cast<IMP>(canBecomeMainWindow)));
+#endif
+
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ oldSendEvent = reinterpret_cast<sendEventPtr>(
+ method_setImplementation(method, reinterpret_cast<IMP>(sendEvent)));
+
+ // Alloc
+ windowObserver = [[QWK_NSWindowObserver alloc] init];
+ }
+
+ static void restoreImplementations() {
+ Method method = class_getInstanceMethod(windowClass, @selector(setStyleMask:));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldSetStyleMask));
+ oldSetStyleMask = nil;
+
+ method =
+ class_getInstanceMethod(windowClass, @selector(setTitlebarAppearsTransparent:));
+ method_setImplementation(method,
+ reinterpret_cast<IMP>(oldSetTitlebarAppearsTransparent));
+ oldSetTitlebarAppearsTransparent = nil;
+
+#if 0
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeKeyWindow));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeKeyWindow));
+ oldCanBecomeKeyWindow = nil;
+
+ method = class_getInstanceMethod(windowClass, @selector(canBecomeMainWindow));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldCanBecomeMainWindow));
+ oldCanBecomeMainWindow = nil;
+#endif
+
+ method = class_getInstanceMethod(windowClass, @selector(sendEvent:));
+ method_setImplementation(method, reinterpret_cast<IMP>(oldSendEvent));
+ oldSendEvent = nil;
+
+ // Delete
+ [windowObserver release];
+ windowObserver = nil;
+ }
+
+ static inline const Class windowClass = [NSWindow class];
+
+ static inline const Class visualEffectViewClass = NSClassFromString(@"NSVisualEffectView");
+
+ protected:
static BOOL canBecomeKeyWindow(id obj, SEL sel) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
}
@@ -121,7 +383,7 @@
}
static BOOL canBecomeMainWindow(id obj, SEL sel) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
}
@@ -133,7 +395,7 @@
}
static void setStyleMask(id obj, SEL sel, NSWindowStyleMask styleMask) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
styleMask |= NSWindowStyleMaskFullSizeContentView;
}
@@ -143,7 +405,7 @@
}
static void setTitlebarAppearsTransparent(id obj, SEL sel, BOOL transparent) {
- if (instances.contains(reinterpret_cast<NSWindow *>(obj))) {
+ if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
transparent = YES;
}
@@ -177,11 +439,14 @@
Q_DISABLE_COPY(NSWindowProxy)
NSWindow *nswindow = nil;
+ NSView *blurEffect = nil;
+
+ bool systemButtonVisible = true;
+ QRect systemButtonRect;
+
+ static inline QWK_NSWindowObserver *windowObserver = nil;
+
// NSEvent *lastMouseDownEvent = nil;
-
- static inline QHash<NSWindow *, NSWindowProxy *> instances = {};
-
- static inline Class windowClass = nil;
using setStyleMaskPtr = void (*)(id, SEL, NSWindowStyleMask);
static inline setStyleMaskPtr oldSetStyleMask = nil;
@@ -199,41 +464,41 @@
static inline sendEventPtr oldSendEvent = nil;
};
- using ProxyList = QHash<WId, NSWindowProxy *>;
- Q_GLOBAL_STATIC(ProxyList, g_proxyList);
-
static inline NSWindow *mac_getNSWindow(const WId windowId) {
const auto nsview = reinterpret_cast<NSView *>(windowId);
return [nsview window];
}
- static inline void cleanupProxy() {
- if (g_proxyList()->isEmpty()) {
- return;
- }
- const auto &data = *g_proxyList();
- qDeleteAll(data);
- g_proxyList()->clear();
- }
-
static inline NSWindowProxy *ensureWindowProxy(const WId windowId) {
- auto it = g_proxyList()->find(windowId);
- if (it == g_proxyList()->end()) {
+ if (g_proxyList->isEmpty()) {
+ NSWindowProxy::replaceImplementations();
+ }
+
+ auto it = g_proxyList->find(windowId);
+ if (it == g_proxyList->end()) {
NSWindow *nswindow = mac_getNSWindow(windowId);
const auto proxy = new NSWindowProxy(nswindow);
- it = g_proxyList()->insert(windowId, proxy);
- }
- static bool cleanerInstalled = false;
- if (!cleanerInstalled) {
- cleanerInstalled = true;
- qAddPostRoutine(cleanupProxy);
+ it = g_proxyList->insert(windowId, proxy);
}
return it.value();
}
- class CocoaWindowEventFilter : public QObject {
+ static inline void releaseWindowProxy(const WId windowId) {
+ if (auto proxy = g_proxyList->take(windowId)) {
+ proxy->setSystemTitleBarVisible(true);
+ delete proxy;
+ } else {
+ return;
+ }
+
+ if (g_proxyList->isEmpty()) {
+ NSWindowProxy::restoreImplementations();
+ }
+ }
+
+ class CocoaWindowEventFilter : public SharedEventFilter {
public:
- explicit CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ explicit CocoaWindowEventFilter(AbstractWindowContext *context);
~CocoaWindowEventFilter() override;
enum WindowStatus {
@@ -244,7 +509,7 @@
};
protected:
- bool eventFilter(QObject *object, QEvent *event) override;
+ bool sharedEventFilter(QObject *object, QEvent *event) override;
private:
AbstractWindowContext *m_context;
@@ -252,30 +517,28 @@
WindowStatus m_windowStatus;
};
- CocoaWindowEventFilter::CocoaWindowEventFilter(AbstractWindowContext *context, QObject *parent)
- : QObject(parent), m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
- m_context->window()->installEventFilter(this);
+ CocoaWindowEventFilter::CocoaWindowEventFilter(AbstractWindowContext *context)
+ : m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
+ m_context->installSharedEventFilter(this);
}
CocoaWindowEventFilter::~CocoaWindowEventFilter() = default;
- bool CocoaWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ bool CocoaWindowEventFilter::sharedEventFilter(QObject *obj, QEvent *event) {
Q_UNUSED(obj)
+
auto type = event->type();
if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
return false;
}
- QObject *host = m_context->host();
- QWindow *window = m_context->window();
- WindowItemDelegate *delegate = m_context->delegate();
+ auto host = m_context->host();
+ auto window = m_context->window();
+ auto delegate = m_context->delegate();
auto me = static_cast<const QMouseEvent *>(event);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- QPoint scenePos = me->scenePosition().toPoint();
- QPoint globalPos = me->globalPosition().toPoint();
-#else
- QPoint scenePos = me->windowPos().toPoint();
- QPoint globalPos = me->screenPos().toPoint();
-#endif
+
+ QPoint scenePos = getMouseEventScenePos(me);
+ QPoint globalPos = getMouseEventGlobalPos(me);
+
bool inTitleBar = m_context->isInTitleBarDraggableArea(scenePos);
switch (type) {
case QEvent::MouseButtonPress: {
@@ -289,7 +552,6 @@
event->accept();
return true;
}
- m_windowStatus = WaitingRelease;
break;
}
case Qt::RightButton: {
@@ -299,6 +561,7 @@
default:
break;
}
+ m_windowStatus = WaitingRelease;
break;
}
@@ -332,7 +595,7 @@
}
case PreparingMove: {
m_windowStatus = Moving;
- window->startSystemMove();
+ startSystemMove(window);
event->accept();
return true;
}
@@ -366,10 +629,11 @@
}
CocoaWindowContext::CocoaWindowContext() : AbstractWindowContext() {
+ cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this);
}
CocoaWindowContext::~CocoaWindowContext() {
- // TODO: deref something?
+ releaseWindowProxy(windowId);
}
QString CocoaWindowContext::key() const {
@@ -378,23 +642,77 @@
void CocoaWindowContext::virtual_hook(int id, void *data) {
switch (id) {
- case ShowSystemMenuHook:
- // TODO: mac system menu
+ case SystemButtonAreaChangedHook: {
+ ensureWindowProxy(windowId)->setSystemButtonRect(m_systemButtonArea);
return;
- case SystemButtonAreaChangedHook:
- // TODO: mac system button rect updated
- return;
+ }
+
default:
break;
}
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged(QWindow *oldWindow, bool destroyed) {
+ void CocoaWindowContext::winIdChanged() {
+ // If the original window id is valid, remove all resources related
+ if (windowId) {
+ releaseWindowProxy(windowId);
+ windowId = 0;
+ }
+
+ if (!m_windowHandle) {
+ return;
+ }
+
+ // Allocate new resources
windowId = m_windowHandle->winId();
ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
- cocoaWindowEventFilter = std::make_unique<CocoaWindowEventFilter>(this, this);
- return true;
+ }
+
+ bool CocoaWindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ Q_UNUSED(oldAttribute)
+
+ if (key == QStringLiteral("no-system-buttons")) {
+ if (attribute.type() != QVariant::Bool)
+ return false;
+ ensureWindowProxy(windowId)->setSystemButtonVisible(!attribute.toBool());
+ return true;
+ }
+
+ if (key == QStringLiteral("blur-effect")) {
+ // Class not available
+ if (!NSWindowProxy::visualEffectViewClass) {
+ return false;
+ }
+
+ auto option = NSWindowProxy::BlurMode::None;
+ if (attribute.type() == QVariant::Bool) {
+ if (attribute.toBool()) {
+ NSString *osxMode =
+ [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+ option = [osxMode isEqualToString:@"Dark"] ? NSWindowProxy::BlurMode::Dark
+ : NSWindowProxy::BlurMode::Light;
+ }
+ } else if (attribute.type() == QVariant::String) {
+ auto value = attribute.toString();
+ if (value == QStringLiteral("dark")) {
+ option = NSWindowProxy::BlurMode::Dark;
+ } else if (value == QStringLiteral("light")) {
+ option = NSWindowProxy::BlurMode::Light;
+ } else if (value == QStringLiteral("none")) {
+ // ...
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ ensureWindowProxy(windowId)->setBlurEffect(option);
+ return true;
+ }
+
+ return false;
}
}
--
Gitblit v1.9.1