From 76924a335f40a0c3cc13805b4cb9429c336d33ca Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 29 12月 2023 11:34:22 +0800
Subject: [PATCH] Optimize system button area APIs
---
src/core/contexts/cocoawindowcontext.mm | 231 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 129 insertions(+), 102 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index 54a3dbe..cc9bfeb 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -10,6 +10,9 @@
#include "qwkglobal_p.h"
#include "systemwindow_p.h"
+// 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)/
+// https://nyrra33.com/2019/03/26/changing-titlebars-height/
+
namespace QWK {
struct NSWindowProxy;
@@ -24,12 +27,16 @@
struct QWK_NSWindowDelegate {
public:
+ enum NSEventType {
+ WillEnterFullScreen,
+ DidEnterFullScreen,
+ WillExitFullScreen,
+ DidExitFullScreen,
+ DidResize,
+ };
+
virtual ~QWK_NSWindowDelegate() = default;
- virtual void windowWillEnterFullScreen(){};
- virtual void windowDidEnterFullScreen(){};
- virtual void windowWillExitFullScreen(){};
- virtual void windowDidExitFullScreen(){};
- virtual void windowDidResize(){};
+ virtual void windowEvent(NSEventType eventType) = 0;
};
//
@@ -77,35 +84,40 @@
- (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();
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowEvent(
+ QWK_NSWindowDelegate::WillEnterFullScreen);
}
}
- (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();
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowEvent(
+ QWK_NSWindowDelegate::DidEnterFullScreen);
}
}
- (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();
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowEvent(
+ QWK_NSWindowDelegate::WillExitFullScreen);
}
}
- (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();
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowEvent(
+ QWK_NSWindowDelegate::DidExitFullScreen);
}
}
- (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();
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowEvent(
+ QWK_NSWindowDelegate::DidResize);
}
}
@@ -130,84 +142,92 @@
}
~NSWindowProxy() override {
- if (blurEffect) {
- setBlurEffect(BlurMode::None);
- }
g_proxyIndexes->remove(nswindow);
}
- void windowWillEnterFullScreen() override {
- }
+ // Delegate
+ void windowEvent(NSEventType eventType) override {
+ switch (eventType) {
+ case WillExitFullScreen: {
+ if (!screenRectCallback || !systemButtonVisible)
+ return;
- void windowDidEnterFullScreen() override {
- }
+ // 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;
+ }
+ break;
+ }
- void windowWillExitFullScreen() override {
- if (systemButtonRect.isEmpty() || !systemButtonVisible)
- return;
+ case DidExitFullScreen: {
+ if (!screenRectCallback || !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;
+ for (const auto &button : systemButtons()) {
+ button.hidden = false;
+ }
+ updateSystemButtonRect();
+ break;
+ }
+
+ case DidResize: {
+ if (!screenRectCallback || !systemButtonVisible) {
+ return;
+ }
+ updateSystemButtonRect();
+ break;
+ }
+
+ default:
+ break;
}
}
- 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;
- }
- updateSystemButtonRect();
- }
-
+ // System buttons visibility
void setSystemButtonVisible(bool visible) {
systemButtonVisible = visible;
for (const auto &button : systemButtons()) {
button.hidden = !visible;
}
- if (systemButtonRect.isEmpty() || !visible) {
+ if (!screenRectCallback || !visible) {
return;
}
updateSystemButtonRect();
}
- void setSystemButtonRect(const QRect &rect) {
- systemButtonRect = rect;
+ // System buttons area
+ void setScreenRectCallback(const ScreenRectCallback &callback) {
+ screenRectCallback = callback;
- if (rect.isEmpty() || !systemButtonVisible) {
+ if (!callback || !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 titlebar = rightButton.superview;
+ int titlebarHeight = titlebar.frame.size.height;
+
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();
+ auto viewSize =
+ nswindow.contentView ? nswindow.contentView.frame.size : nswindow.frame.size;
+ QPoint center = screenRectCallback(QSize(viewSize.width, titlebarHeight)).center();
+
+ // The origin of the NSWindow coordinate system is in the lower left corner, we
+ // do the necessary transformations
+ center.ry() = titlebarHeight - center.y();
// Mid button
NSPoint centerOrigin = {
@@ -238,47 +258,54 @@
return {closeBtn, minimizeBtn, zoomBtn};
}
- void setBlurEffect(BlurMode option) {
- if (option == BlurMode::None) {
- if (!blurEffect) {
- return;
+ inline int titleBarHeight() const {
+ NSButton *closeBtn = [nswindow standardWindowButton:NSWindowCloseButton];
+ return closeBtn.superview.frame.size.height;
+ }
+
+ // 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);
}
- [blurEffect removeFromSuperview];
- [blurEffect release];
- blurEffect = nil;
+ }
+ 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 {
- if (!blurEffect) {
- NSView *const view = [nswindow contentView];
- NSVisualEffectView *const blurView =
- [[visualEffectViewClass alloc] initWithFrame:view.bounds];
- blurView.material = NSVisualEffectMaterialUnderWindowBackground;
- blurView.blendingMode = NSVisualEffectBlendingModeBehindWindow;
- blurView.state = NSVisualEffectStateFollowsWindowActiveState;
+ effectView.material = NSVisualEffectMaterialUnderWindowBackground;
+ effectView.blendingMode = NSVisualEffectBlendingModeBehindWindow;
+ effectView.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"];
+ if (mode == BlurMode::Dark) {
+ effectView.appearance =
+ [NSAppearance appearanceNamed:@"NSAppearanceNameVibrantDark"];
} else {
- view.appearance =
+ effectView.appearance =
[NSAppearance appearanceNamed:@"NSAppearanceNameVibrantLight"];
}
}
+ return true;
}
- void updateBlurEffectSize() {
- const NSView *const view = [nswindow contentView];
- blurEffect.frame = view.frame;
- }
-
+ // System title bar
void setSystemTitleBarVisible(const bool visible) {
NSView *nsview = [nswindow contentView];
if (!nsview) {
@@ -295,7 +322,7 @@
nswindow.titlebarAppearsTransparent = (visible ? NO : YES);
nswindow.titleVisibility = (visible ? NSWindowTitleVisible : NSWindowTitleHidden);
nswindow.hasShadow = YES;
- nswindow.showsToolbarButton = NO;
+ // nswindow.showsToolbarButton = NO;
nswindow.movableByWindowBackground = NO;
nswindow.movable = NO; // This line causes the window in the wrong position when
// become fullscreen.
@@ -367,8 +394,6 @@
static inline const Class windowClass = [NSWindow class];
- static inline const Class visualEffectViewClass = NSClassFromString(@"NSVisualEffectView");
-
protected:
static BOOL canBecomeKeyWindow(id obj, SEL sel) {
if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
@@ -439,10 +464,9 @@
Q_DISABLE_COPY(NSWindowProxy)
NSWindow *nswindow = nil;
- NSView *blurEffect = nil;
bool systemButtonVisible = true;
- QRect systemButtonRect;
+ ScreenRectCallback screenRectCallback;
static inline QWK_NSWindowObserver *windowObserver = nil;
@@ -643,7 +667,7 @@
void CocoaWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case SystemButtonAreaChangedHook: {
- ensureWindowProxy(windowId)->setSystemButtonRect(m_systemButtonArea);
+ ensureWindowProxy(windowId)->setScreenRectCallback(m_systemButtonAreaCallback);
return;
}
@@ -651,6 +675,15 @@
break;
}
AbstractWindowContext::virtual_hook(id, data);
+ }
+
+ QVariant CocoaWindowContext::windowAttribute(const QString &key) const {
+ if (key == QStringLiteral("title-bar-height")) {
+ if (!m_windowHandle)
+ return 0;
+ return ensureWindowProxy(windowId)->titleBarHeight();
+ }
+ return AbstractWindowContext::windowAttribute(key);
}
void CocoaWindowContext::winIdChanged() {
@@ -681,25 +714,20 @@
}
if (key == QStringLiteral("blur-effect")) {
- // Class not available
- if (!NSWindowProxy::visualEffectViewClass) {
- return false;
- }
-
- auto option = NSWindowProxy::BlurMode::None;
+ auto mode = 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;
+ mode = [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;
+ mode = NSWindowProxy::BlurMode::Dark;
} else if (value == QStringLiteral("light")) {
- option = NSWindowProxy::BlurMode::Light;
+ mode = NSWindowProxy::BlurMode::Light;
} else if (value == QStringLiteral("none")) {
// ...
} else {
@@ -708,8 +736,7 @@
} else {
return false;
}
- ensureWindowProxy(windowId)->setBlurEffect(option);
- return true;
+ return ensureWindowProxy(windowId)->setBlurEffect(mode);
}
return false;
--
Gitblit v1.9.1