From 5706ba3d99f6a147499d6a122959ed865e447470 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周三, 12 2月 2025 21:23:14 +0800
Subject: [PATCH] Update
---
src/core/contexts/abstractwindowcontext.cpp | 214 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 189 insertions(+), 25 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index ef1efbf..beea180 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -1,7 +1,12 @@
+// 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 "abstractwindowcontext_p.h"
#include <QtGui/QPen>
#include <QtGui/QPainter>
+#include <QtGui/QScreen>
#include "qwkglobal_p.h"
@@ -17,36 +22,54 @@
}
m_host = host;
m_delegate.reset(delegate);
- m_windowHandle = m_delegate->hostWindow(m_host);
- if (m_windowHandle) {
- winIdChanged(nullptr);
- }
+ m_winIdChangeEventFilter.reset(delegate->createWinIdEventFilter(host, this));
+ notifyWinIdChange();
}
- bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
+ bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
Q_ASSERT(obj);
if (!obj) {
return false;
}
+ auto it = m_hitTestVisibleItems.find(obj);
if (visible) {
+ if (it != m_hitTestVisibleItems.end()) {
+ return true;
+ }
+ connect(obj, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_hitTestVisibleItemDestroyed);
m_hitTestVisibleItems.insert(obj);
} else {
- m_hitTestVisibleItems.remove(obj);
+ if (it == m_hitTestVisibleItems.end()) {
+ return false;
+ }
+ disconnect(obj, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_hitTestVisibleItemDestroyed);
+ m_hitTestVisibleItems.erase(it);
}
return true;
}
bool AbstractWindowContext::setSystemButton(WindowAgentBase::SystemButton button,
QObject *obj) {
- Q_ASSERT(obj);
Q_ASSERT(button != WindowAgentBase::Unknown);
- if (!obj || (button == WindowAgentBase::Unknown)) {
+ if (button == WindowAgentBase::Unknown) {
return false;
}
- if (m_systemButtons[button] == obj) {
- return false;
+ auto org = m_systemButtons[button];
+ if (org == obj) {
+ return true;
+ }
+
+ if (org) {
+ disconnect(org, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_systemButtonDestroyed);
+ }
+ if (obj) {
+ connect(obj, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_systemButtonDestroyed);
}
m_systemButtons[button] = obj;
return true;
@@ -54,20 +77,27 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (!item) {
+ auto org = m_titleBar;
+ if (org == item) {
return false;
}
- if (m_titleBar == item) {
- return false;
+ if (org) {
+ // Since the title bar is changed, all items inside it should be dereferenced right away
+ removeSystemButtonsAndHitTestItems();
+ disconnect(org, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_titleBarDistroyed);
+ }
+ if (item) {
+ connect(item, &QObject::destroyed, this, &AbstractWindowContext::_q_titleBarDistroyed);
}
m_titleBar = item;
return true;
}
#ifdef Q_OS_MAC
- void AbstractWindowContext::setSystemButtonArea(const QRect &rect) {
- m_systemButtonArea = rect;
+ void AbstractWindowContext::setSystemButtonAreaCallback(const ScreenRectCallback &callback) {
+ m_systemButtonAreaCallback = callback;
virtual_hook(SystemButtonAreaChangedHook, nullptr);
}
#endif
@@ -144,13 +174,30 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
- // TODO: Qt
- break;
+ if (!m_windowId)
+ return;
+
+ QRect windowGeometry = m_delegate->getGeometry(m_host);
+ QRect screenGeometry = m_windowHandle->screen()->geometry();
+ int x = (screenGeometry.width() - windowGeometry.width()) / 2;
+ int y = (screenGeometry.height() - windowGeometry.height()) / 2;
+ QPoint pos(x, y);
+ pos += screenGeometry.topLeft();
+ m_delegate->setGeometry(m_host, QRect(pos, windowGeometry.size()));
+ return;
}
- case ShowSystemMenuHook: {
- // TODO: Qt
- break;
+ case RaiseWindowHook: {
+ if (!m_windowId)
+ return;
+
+ m_delegate->setWindowVisible(m_host, true);
+ Qt::WindowStates state = m_delegate->getWindowState(m_host);
+ if (state & Qt::WindowMinimized) {
+ m_delegate->setWindowState(m_host, state & ~Qt::WindowMinimized);
+ }
+ m_delegate->bringWindowToTop(m_host);
+ return;
}
case DefaultColorsHook: {
@@ -173,11 +220,128 @@
}
void AbstractWindowContext::notifyWinIdChange() {
- auto oldWindow = m_windowHandle;
- m_windowHandle = m_delegate->window(m_host);
- if (oldWindow == m_windowHandle)
- return;
- winIdChanged(oldWindow);
+ auto oldWinId = m_windowId;
+ m_windowId = m_winIdChangeEventFilter->winId();
+
+ // In Qt6, after QWidget::close() is called, the related QWindow's all surfaces and the
+ // platform window will be removed, and the WinId will be set to 0. After that, when the
+ // QWidget is shown again, the whole things will be recreated again.
+ // As a result, we must update our WindowContext each time the WinId changes.
+ if (m_windowHandle) {
+ removeEventFilter(m_windowHandle);
+ }
+ m_windowHandle = m_delegate->hostWindow(m_host);
+ if (m_windowHandle) {
+ m_windowHandle->installEventFilter(this);
+ }
+
+ if (oldWinId != m_windowId) {
+ winIdChanged(m_windowId, oldWinId);
+
+ if (m_windowId) {
+ // Refresh window attributes
+ for (auto it = m_windowAttributesOrder.begin();
+ it != m_windowAttributesOrder.end();) {
+ if (!windowAttributeChanged(it->first, it->second, {})) {
+ m_windowAttributes.remove(it->first);
+ it = m_windowAttributesOrder.erase(it);
+ continue;
+ }
+ ++it;
+ }
+ }
+
+ // Send to shared dispatchers
+ QEvent e(QEvent::WinIdChange);
+ sharedDispatch(m_host, &e);
+ }
+ }
+
+ QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
+ auto it = m_windowAttributes.find(key);
+ if (it == m_windowAttributes.end()) {
+ return {};
+ }
+ return it.value()->second;
+ }
+
+ bool AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &attribute) {
+ auto it = m_windowAttributes.find(key);
+ if (it == m_windowAttributes.end()) {
+ if (!attribute.isValid()) {
+ return true;
+ }
+ if (m_windowId && !windowAttributeChanged(key, attribute, {})) {
+ return false;
+ }
+ m_windowAttributes.insert(
+ key, m_windowAttributesOrder.insert(m_windowAttributesOrder.end(),
+ std::make_pair(key, attribute)));
+ return true;
+ }
+
+ auto &listIter = it.value();
+ auto &oldAttr = listIter->second;
+ if (m_windowId && !windowAttributeChanged(key, attribute, oldAttr)) {
+ return false;
+ }
+
+ if (attribute.isValid()) {
+ oldAttr = attribute;
+ m_windowAttributesOrder.splice(m_windowAttributesOrder.end(), m_windowAttributesOrder,
+ listIter);
+ } else {
+ m_windowAttributesOrder.erase(listIter);
+ m_windowAttributes.erase(it);
+ }
+ return true;
+ }
+
+ bool AbstractWindowContext::eventFilter(QObject *obj, QEvent *event) {
+ if (obj == m_windowHandle && sharedDispatch(obj, event)) {
+ return true;
+ }
+ return QObject::eventFilter(obj, event);
+ }
+
+ bool AbstractWindowContext::windowAttributeChanged(const QString &key,
+ const QVariant &attribute,
+ const QVariant &oldAttribute) {
+ return false;
+ }
+
+ void AbstractWindowContext::removeSystemButtonsAndHitTestItems() {
+ for (auto &button : m_systemButtons) {
+ if (!button) {
+ continue;
+ }
+ disconnect(button, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_systemButtonDestroyed);
+ button = nullptr;
+ }
+ for (auto &item : m_hitTestVisibleItems) {
+ disconnect(item, &QObject::destroyed, this,
+ &AbstractWindowContext::_q_hitTestVisibleItemDestroyed);
+ }
+ m_hitTestVisibleItems.clear();
+ }
+
+ void AbstractWindowContext::_q_titleBarDistroyed(QObject *obj) {
+ Q_UNUSED(obj)
+ removeSystemButtonsAndHitTestItems();
+ m_titleBar = nullptr;
+ }
+
+ void AbstractWindowContext::_q_hitTestVisibleItemDestroyed(QObject *obj) {
+ m_hitTestVisibleItems.remove(obj);
+ }
+
+ void AbstractWindowContext::_q_systemButtonDestroyed(QObject *obj) {
+ for (auto &item : m_systemButtons) {
+ if (item == obj) {
+ item = nullptr;
+ }
+ }
}
}
--
Gitblit v1.9.1