From 9dcea027f16c4ce5852da3dfc8aca284c582bd7d Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu.greentest.com.cn>
Date: 周五, 06 6月 2025 18:19:18 +0800
Subject: [PATCH] 1.注释掉custom margin，解决程序放大后，遮盖窗口底部内容的问题。
---
src/core/contexts/abstractwindowcontext.cpp | 207 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 153 insertions(+), 54 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 5ce7c8c..f2fc730 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -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 "abstractwindowcontext_p.h"
#include <QtGui/QPen>
@@ -18,37 +22,26 @@
}
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();
}
- void AbstractWindowContext::setWindowAttribute(const QString &key, const QVariant &var) {
- auto it = m_windowAttributes.find(key);
- if (it.value() == var)
- return;
-
- auto newVar = var;
- auto oldVar = it.value();
- void *a[] = {
- &const_cast<QString &>(key),
- &newVar,
- &oldVar,
- };
- virtual_hook(WindowAttributeChangedHook, a);
- }
-
- bool AbstractWindowContext::setHitTestVisible(const QObject *obj, bool visible) {
+ bool AbstractWindowContext::setHitTestVisible(QObject *obj, bool visible) {
Q_ASSERT(obj);
if (!obj) {
return false;
}
if (visible) {
- m_hitTestVisibleItems.insert(obj);
+ m_hitTestVisibleItems.removeAll(nullptr);
+ m_hitTestVisibleItems.removeAll(obj);
+ m_hitTestVisibleItems.append(obj);
} else {
- m_hitTestVisibleItems.remove(obj);
+ for (auto &item : m_hitTestVisibleItems) {
+ if (item == obj) {
+ item = nullptr;
+ }
+ }
}
return true;
}
@@ -60,7 +53,8 @@
return false;
}
- if (m_systemButtons[button] == obj) {
+ auto org = m_systemButtons[button];
+ if (org == obj) {
return false;
}
m_systemButtons[button] = obj;
@@ -69,16 +63,22 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (m_titleBar == item) {
+ auto org = m_titleBar;
+ if (org == item) {
return false;
+ }
+
+ if (org) {
+ // Since the title bar is changed, all items inside it should be dereferenced right away
+ removeSystemButtonsAndHitTestItems();
}
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
@@ -88,8 +88,7 @@
*button = WindowAgentBase::Unknown;
for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
auto currentButton = m_systemButtons[i];
- if (!currentButton || !m_delegate->isVisible(currentButton) ||
- !m_delegate->isEnabled(currentButton)) {
+ if (!currentButton || !m_delegate->isVisible(currentButton)) {
continue;
}
if (m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
@@ -122,22 +121,17 @@
return false;
}
- for (int i = WindowAgentBase::WindowIcon; i <= WindowAgentBase::Close; ++i) {
- auto currentButton = m_systemButtons[i];
- if (currentButton && m_delegate->isVisible(currentButton) &&
- m_delegate->isEnabled(currentButton) &&
- m_delegate->mapGeometryToScene(currentButton).contains(pos)) {
+ WindowAgentBase::SystemButton button;
+ if (isInSystemButtons(pos, &button)) {
+ return false;
+ }
+
+ for (auto item : m_hitTestVisibleItems) {
+ if (item && m_delegate->isVisible(item) &&
+ m_delegate->mapGeometryToScene(item).contains(pos)) {
return false;
}
}
-
- for (auto widget : m_hitTestVisibleItems) {
- if (widget && m_delegate->isVisible(widget) && m_delegate->isEnabled(widget) &&
- m_delegate->mapGeometryToScene(widget).contains(pos)) {
- return false;
- }
- }
-
return true;
}
@@ -155,18 +149,30 @@
void AbstractWindowContext::virtual_hook(int id, void *data) {
switch (id) {
case CentralizeHook: {
+ if (!m_windowId)
+ return;
+
+ QRect windowGeometry = m_delegate->getGeometry(m_host);
QRect screenGeometry = m_windowHandle->screen()->geometry();
- int x = screenGeometry.width() / 2 - m_windowHandle->width() / 2;
- int y = screenGeometry.height() / 2 - m_windowHandle->height() / 2;
- m_windowHandle->setPosition(x, y);
- break;
+ 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 RaiseWindowHook: {
- if (m_windowHandle->windowStates() & Qt::WindowMinimized)
- m_windowHandle->showNormal();
- m_windowHandle->raise();
- break;
+ 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: {
@@ -189,11 +195,104 @@
}
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;
+ }
+ button = nullptr;
+ }
+ m_hitTestVisibleItems.clear();
}
}
--
Gitblit v1.9.1