From 06b335edde08b91aeb5497719f2d584f98abd7c4 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: ćšć, 28 12æ 2023 23:04:49 +0800
Subject: [PATCH] clean code
---
src/core/contexts/cocoawindowcontext.mm | 188 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 174 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 21616d5..eed5bfd 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -118,6 +118,12 @@
namespace QWK {
struct NSWindowProxy : public QWK_NSWindowDelegate {
+ enum class BlurMode {
+ Dark,
+ Light,
+ None,
+ };
+
NSWindowProxy(NSWindow *macWindow) {
nswindow = macWindow;
g_proxyIndexes->insert(nswindow, this);
@@ -127,26 +133,150 @@
g_proxyIndexes->remove(nswindow);
}
+ // Delegate
void windowWillEnterFullScreen() override {
- qDebug() << "windowWillEnterFullScreen";
}
void windowDidEnterFullScreen() override {
- qDebug() << "windowDidEnterFullScreen";
}
void windowWillExitFullScreen() override {
- qDebug() << "windowWillExitFullScreen";
+ 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 {
- qDebug() << "windowDidExitFullScreen";
+ if (systemButtonRect.isEmpty() || !systemButtonVisible)
+ return;
+
+ for (const auto &button : systemButtons()) {
+ button.hidden = false;
+ }
+ updateSystemButtonRect();
}
void windowDidResize() override {
- qDebug() << "windowDidResize";
+ if (systemButtonRect.isEmpty() || !systemButtonVisible) {
+ return;
+ }
+ updateSystemButtonRect();
}
+ // System buttons visibility
+ void setSystemButtonVisible(bool visible) {
+ systemButtonVisible = visible;
+ for (const auto &button : systemButtons()) {
+ button.hidden = !visible;
+ }
+
+ if (systemButtonRect.isEmpty() || !visible) {
+ return;
+ }
+ updateSystemButtonRect();
+ }
+
+ // System buttons area
+ 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};
+ }
+
+ // Blur effect
+ bool setBlurEffect(BlurMode mode) {
+ static Class visualEffectViewClass = NSClassFromString(@"NSVisualEffectView");
+ if (!visualEffectViewClass)
+ return false;
+
+ NSVisualEffectView *effectView = nil;
+ NSView *const view = [nswindow contentView];
+ for (NSView *subview in [[view superview] subviews]) {
+ if ([subview isKindOfClass:visualEffectViewClass]) {
+ effectView = reinterpret_cast<NSVisualEffectView *>(subview);
+ }
+ }
+ if (effectView == nil) {
+ return false;
+ }
+
+ static const auto originalMaterial = effectView.material;
+ static const auto originalBlendingMode = effectView.blendingMode;
+ static const auto originalState = effectView.state;
+
+ if (mode == BlurMode::None) {
+ effectView.material = originalMaterial;
+ effectView.blendingMode = originalBlendingMode;
+ effectView.state = originalState;
+ effectView.appearance = nil;
+ } else {
+ effectView.material = NSVisualEffectMaterialUnderWindowBackground;
+ effectView.blendingMode = NSVisualEffectBlendingModeBehindWindow;
+ effectView.state = NSVisualEffectStateFollowsWindowActiveState;
+
+ if (mode == BlurMode::Dark) {
+ effectView.appearance =
+ [NSAppearance appearanceNamed:@"NSAppearanceNameVibrantDark"];
+ } else {
+ effectView.appearance =
+ [NSAppearance appearanceNamed:@"NSAppearanceNameVibrantLight"];
+ }
+ }
+ return true;
+ }
+
+ // System title bar
void setSystemTitleBarVisible(const bool visible) {
NSView *nsview = [nswindow contentView];
if (!nsview) {
@@ -233,7 +363,9 @@
windowObserver = nil;
}
- private:
+ static inline const Class windowClass = [NSWindow class];
+
+ protected:
static BOOL canBecomeKeyWindow(id obj, SEL sel) {
if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
return YES;
@@ -299,12 +431,13 @@
#endif
}
- static inline const Class windowClass = [NSWindow class];
-
private:
Q_DISABLE_COPY(NSWindowProxy)
NSWindow *nswindow = nil;
+
+ bool systemButtonVisible = true;
+ QRect systemButtonRect;
static inline QWK_NSWindowObserver *windowObserver = nil;
@@ -505,7 +638,7 @@
void CocoaWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case SystemButtonAreaChangedHook: {
- // TODO: mac system button rect updated
+ ensureWindowProxy(windowId)->setSystemButtonRect(m_systemButtonArea);
return;
}
@@ -533,14 +666,41 @@
bool CocoaWindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
const QVariant &oldAttribute) {
+ Q_UNUSED(oldAttribute)
+
if (key == QStringLiteral("no-system-buttons")) {
- if (attribute.toBool()) {
- // TODO: set off
- } else {
- // TODO: set on
- }
+ if (attribute.type() != QVariant::Bool)
+ return false;
+ ensureWindowProxy(windowId)->setSystemButtonVisible(!attribute.toBool());
return true;
}
+
+ if (key == QStringLiteral("blur-effect")) {
+ auto mode = NSWindowProxy::BlurMode::None;
+ if (attribute.type() == QVariant::Bool) {
+ if (attribute.toBool()) {
+ NSString *osxMode =
+ [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+ mode = [osxMode isEqualToString:@"Dark"] ? NSWindowProxy::BlurMode::Dark
+ : NSWindowProxy::BlurMode::Light;
+ }
+ } else if (attribute.type() == QVariant::String) {
+ auto value = attribute.toString();
+ if (value == QStringLiteral("dark")) {
+ mode = NSWindowProxy::BlurMode::Dark;
+ } else if (value == QStringLiteral("light")) {
+ mode = NSWindowProxy::BlurMode::Light;
+ } else if (value == QStringLiteral("none")) {
+ // ...
+ } else {
+ return false;
+ }
+ } else {
+ return false;
+ }
+ return ensureWindowProxy(windowId)->setBlurEffect(mode);
+ }
+
return false;
}
--
Gitblit v1.9.1