From 469c975a708ed86c834b59ed751a4548c693a7b9 Mon Sep 17 00:00:00 2001
From: 李威 wei.li <108964761+liwey1985@users.noreply.github.com>
Date: 周一, 21 4月 2025 15:34:54 +0800
Subject: [PATCH] Fix NSWindowProxy::setSystemButtonVisible not taking effect (#175)
---
src/core/contexts/cocoawindowcontext.mm | 293 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 199 insertions(+), 94 deletions(-)
diff --git a/src/core/contexts/cocoawindowcontext.mm b/src/core/contexts/cocoawindowcontext.mm
index eed5bfd..28738c6 100644
--- a/src/core/contexts/cocoawindowcontext.mm
+++ b/src/core/contexts/cocoawindowcontext.mm
@@ -1,3 +1,7 @@
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
+// SPDX-License-Identifier: Apache-2.0
+
#include "cocoawindowcontext_p.h"
#include <objc/runtime.h>
@@ -10,26 +14,29 @@
#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;
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:
+ 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;
};
//
@@ -76,39 +83,53 @@
- (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();
+ auto nsview = [nswindow contentView];
+ if (auto proxy = QWK::g_proxyList->value(reinterpret_cast<WId>(nsview))) {
+ 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();
+ auto nsview = [nswindow contentView];
+ if (auto proxy = QWK::g_proxyList->value(reinterpret_cast<WId>(nsview))) {
+ 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();
+ auto nsview = [nswindow contentView];
+ if (auto proxy = QWK::g_proxyList->value(reinterpret_cast<WId>(nsview))) {
+ 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();
+ auto nsview = [nswindow contentView];
+ if (auto proxy = QWK::g_proxyList->value(reinterpret_cast<WId>(nsview))) {
+ 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();
+ auto nsview = [nswindow contentView];
+ if (auto proxy = QWK::g_proxyList->value(reinterpret_cast<WId>(nsview))) {
+ reinterpret_cast<QWK_NSWindowDelegate *>(proxy)->windowEvent(
+ QWK_NSWindowDelegate::DidResize);
}
}
+@end
+
+@interface QWK_NSViewObserver : NSObject
+- (instancetype)initWithProxy:(QWK::NSWindowProxy*)proxy;
@end
//
@@ -124,48 +145,59 @@
None,
};
- NSWindowProxy(NSWindow *macWindow) {
- nswindow = macWindow;
- g_proxyIndexes->insert(nswindow, this);
+ NSWindowProxy(NSView *macView) {
+ nsview = macView;
+
+ observer = [[QWK_NSViewObserver alloc] initWithProxy:this];
+ [nsview addObserver:observer
+ forKeyPath:@"window"
+ options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
+ context:nil];
}
~NSWindowProxy() override {
- g_proxyIndexes->remove(nswindow);
+ [nsview removeObserver:observer forKeyPath:@"window"];
+ [observer release];
}
// Delegate
- void windowWillEnterFullScreen() override {
- }
+ 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 (systemButtonRect.isEmpty() || !systemButtonVisible) {
- return;
- }
- updateSystemButtonRect();
}
// System buttons visibility
@@ -175,35 +207,44 @@
button.hidden = !visible;
}
- if (systemButtonRect.isEmpty() || !visible) {
+ if (!screenRectCallback || !visible) {
return;
}
updateSystemButtonRect();
}
// System buttons area
- void setSystemButtonRect(const QRect &rect) {
- systemButtonRect = rect;
+ 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)/
-
+ if (!screenRectCallback || !systemButtonVisible) {
+ return;
+ }
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 = nsview.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 = {
@@ -228,10 +269,23 @@
}
inline std::array<NSButton *, 3> systemButtons() {
+ auto nswindow = [nsview window];
+ if (!nswindow) {
+ return {nullptr, nullptr, nullptr};
+ }
NSButton *closeBtn = [nswindow standardWindowButton:NSWindowCloseButton];
NSButton *minimizeBtn = [nswindow standardWindowButton:NSWindowMiniaturizeButton];
NSButton *zoomBtn = [nswindow standardWindowButton:NSWindowZoomButton];
return {closeBtn, minimizeBtn, zoomBtn};
+ }
+
+ inline int titleBarHeight() const {
+ auto nswindow = [nsview window];
+ if (!nswindow) {
+ return 0;
+ }
+ NSButton *closeBtn = [nswindow standardWindowButton:NSWindowCloseButton];
+ return closeBtn.superview.frame.size.height;
}
// Blur effect
@@ -241,8 +295,7 @@
return false;
NSVisualEffectView *effectView = nil;
- NSView *const view = [nswindow contentView];
- for (NSView *subview in [[view superview] subviews]) {
+ for (NSView *subview in [[nsview superview] subviews]) {
if ([subview isKindOfClass:visualEffectViewClass]) {
effectView = reinterpret_cast<NSVisualEffectView *>(subview);
}
@@ -278,8 +331,8 @@
// System title bar
void setSystemTitleBarVisible(const bool visible) {
- NSView *nsview = [nswindow contentView];
- if (!nsview) {
+ auto nswindow = [nsview window];
+ if (!nswindow) {
return;
}
@@ -293,17 +346,13 @@
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.
- // For some unknown reason, we don't need the following hack in Qt versions below or
- // equal to 6.2.4.
-#if (QT_VERSION > QT_VERSION_CHECK(6, 2, 4))
- [nswindow standardWindowButton:NSWindowCloseButton].hidden = (visible ? NO : YES);
- [nswindow standardWindowButton:NSWindowMiniaturizeButton].hidden = (visible ? NO : YES);
- [nswindow standardWindowButton:NSWindowZoomButton].hidden = (visible ? NO : YES);
-#endif
+ [nswindow standardWindowButton:NSWindowCloseButton].hidden = NO;
+ [nswindow standardWindowButton:NSWindowMiniaturizeButton].hidden = NO;
+ [nswindow standardWindowButton:NSWindowZoomButton].hidden = NO;
}
static void replaceImplementations() {
@@ -367,7 +416,9 @@
protected:
static BOOL canBecomeKeyWindow(id obj, SEL sel) {
- if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
+ auto nswindow = reinterpret_cast<NSWindow *>(obj);
+ auto nsview = [nswindow contentView];
+ if (g_proxyList->contains(reinterpret_cast<WId>(nsview))) {
return YES;
}
@@ -379,7 +430,9 @@
}
static BOOL canBecomeMainWindow(id obj, SEL sel) {
- if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
+ auto nswindow = reinterpret_cast<NSWindow *>(obj);
+ auto nsview = [nswindow contentView];
+ if (g_proxyList->contains(reinterpret_cast<WId>(nsview))) {
return YES;
}
@@ -391,7 +444,9 @@
}
static void setStyleMask(id obj, SEL sel, NSWindowStyleMask styleMask) {
- if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
+ auto nswindow = reinterpret_cast<NSWindow *>(obj);
+ auto nsview = [nswindow contentView];
+ if (g_proxyList->contains(reinterpret_cast<WId>(nsview))) {
styleMask |= NSWindowStyleMaskFullSizeContentView;
}
@@ -401,7 +456,9 @@
}
static void setTitlebarAppearsTransparent(id obj, SEL sel, BOOL transparent) {
- if (g_proxyIndexes->contains(reinterpret_cast<NSWindow *>(obj))) {
+ auto nswindow = reinterpret_cast<NSWindow *>(obj);
+ auto nsview = [nswindow contentView];
+ if (g_proxyList->contains(reinterpret_cast<WId>(nsview))) {
transparent = YES;
}
@@ -434,10 +491,11 @@
private:
Q_DISABLE_COPY(NSWindowProxy)
- NSWindow *nswindow = nil;
+ NSView *nsview = nil;
+ QWK_NSViewObserver* observer = nil;
bool systemButtonVisible = true;
- QRect systemButtonRect;
+ ScreenRectCallback screenRectCallback;
static inline QWK_NSWindowObserver *windowObserver = nil;
@@ -471,8 +529,8 @@
auto it = g_proxyList->find(windowId);
if (it == g_proxyList->end()) {
- NSWindow *nswindow = mac_getNSWindow(windowId);
- const auto proxy = new NSWindowProxy(nswindow);
+ NSView *nsview = reinterpret_cast<NSView *>(windowId);
+ const auto proxy = new NSWindowProxy(nsview);
it = g_proxyList->insert(windowId, proxy);
}
return it.value();
@@ -480,7 +538,10 @@
static inline void releaseWindowProxy(const WId windowId) {
if (auto proxy = g_proxyList->take(windowId)) {
- proxy->setSystemTitleBarVisible(true);
+ // TODO: Determine if the window is valid
+
+ // The window has been destroyed
+ // proxy->setSystemTitleBarVisible(true);
delete proxy;
} else {
return;
@@ -601,10 +662,11 @@
}
case QEvent::MouseButtonDblClick: {
- if (me->button() == Qt::LeftButton && inTitleBar &&
- !delegate->isHostSizeFixed(host)) {
+ if (me->button() == Qt::LeftButton && inTitleBar && !m_context->isHostSizeFixed()) {
+ Qt::WindowFlags windowFlags = delegate->getWindowFlags(host);
Qt::WindowStates windowState = delegate->getWindowState(host);
- if (!(windowState & Qt::WindowFullScreen)) {
+ if ((windowFlags & Qt::WindowMaximizeButtonHint) &&
+ !(windowState & Qt::WindowFullScreen)) {
if (windowState & Qt::WindowMaximized) {
delegate->setWindowState(host, windowState & ~Qt::WindowMaximized);
} else {
@@ -628,7 +690,7 @@
}
CocoaWindowContext::~CocoaWindowContext() {
- releaseWindowProxy(windowId);
+ releaseWindowProxy(m_windowId);
}
QString CocoaWindowContext::key() const {
@@ -638,7 +700,7 @@
void CocoaWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case SystemButtonAreaChangedHook: {
- ensureWindowProxy(windowId)->setSystemButtonRect(m_systemButtonArea);
+ ensureWindowProxy(m_windowId)->setScreenRectCallback(m_systemButtonAreaCallback);
return;
}
@@ -648,30 +710,44 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void CocoaWindowContext::winIdChanged() {
+ QVariant CocoaWindowContext::windowAttribute(const QString &key) const {
+ if (key == QStringLiteral("title-bar-height")) {
+ if (!m_windowId)
+ return {};
+ return ensureWindowProxy(m_windowId)->titleBarHeight();
+ }
+ return AbstractWindowContext::windowAttribute(key);
+ }
+
+ void CocoaWindowContext::winIdChanged(WId winId, WId oldWinId) {
// If the original window id is valid, remove all resources related
- if (windowId) {
- releaseWindowProxy(windowId);
- windowId = 0;
+ if (oldWinId) {
+ releaseWindowProxy(oldWinId);
}
- if (!m_windowHandle) {
+ if (!winId) {
return;
}
// Allocate new resources
- windowId = m_windowHandle->winId();
- ensureWindowProxy(windowId)->setSystemTitleBarVisible(false);
+ const auto proxy = ensureWindowProxy(winId);
+ if (proxy) {
+ proxy->setSystemButtonVisible(!windowAttribute(QStringLiteral("no-system-buttons")).toBool());
+ proxy->setScreenRectCallback(m_systemButtonAreaCallback);
+ proxy->setSystemTitleBarVisible(false);
+ }
}
bool CocoaWindowContext::windowAttributeChanged(const QString &key, const QVariant &attribute,
const QVariant &oldAttribute) {
Q_UNUSED(oldAttribute)
+ Q_ASSERT(m_windowId);
+
if (key == QStringLiteral("no-system-buttons")) {
if (attribute.type() != QVariant::Bool)
return false;
- ensureWindowProxy(windowId)->setSystemButtonVisible(!attribute.toBool());
+ ensureWindowProxy(m_windowId)->setSystemButtonVisible(!attribute.toBool());
return true;
}
@@ -698,10 +774,39 @@
} else {
return false;
}
- return ensureWindowProxy(windowId)->setBlurEffect(mode);
+ return ensureWindowProxy(m_windowId)->setBlurEffect(mode);
}
-
return false;
}
}
+
+@implementation QWK_NSViewObserver {
+ QWK::NSWindowProxy* _proxy; // Weak reference
+}
+
+- (instancetype)initWithProxy:(QWK::NSWindowProxy*)proxy {
+ if (self = [super init]) {
+ _proxy = proxy;
+ }
+ return self;
+}
+
+// Using QEvent::Show to call setSystemTitleBarVisible/updateSystemButtonRect could also work,
+// but observing the window property change via KVO provides more immediate notification when
+// the NSWindow becomes available, making this approach more natural and reliable.
+- (void)observeValueForKeyPath:(NSString*)keyPath
+ ofObject:(id)object
+ change:(NSDictionary*)change
+ context:(void*)context {
+ if ([keyPath isEqualToString:@"window"]) {
+ NSWindow* newWindow = change[NSKeyValueChangeNewKey];
+ // NSWindow* oldWindow = change[NSKeyValueChangeOldKey];
+ if (newWindow) {
+ _proxy->setSystemTitleBarVisible(false);
+ _proxy->updateSystemButtonRect();
+ }
+ }
+}
+
+@end
--
Gitblit v1.9.1