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 | 158 ++++++++++++++++++++++++----------------------------
1 files changed, 74 insertions(+), 84 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext.cpp b/src/core/contexts/abstractwindowcontext.cpp
index 1c11015..f2fc730 100644
--- a/src/core/contexts/abstractwindowcontext.cpp
+++ b/src/core/contexts/abstractwindowcontext.cpp
@@ -12,39 +12,6 @@
namespace QWK {
- namespace {
-
- class WindowEventFilter : public QObject {
- public:
- explicit WindowEventFilter(QWindow *window, AbstractWindowContext *ctx,
- QObject *parent = nullptr)
- : QObject(parent), ctx(ctx), window(window) {
- if (window)
- window->installEventFilter(this);
- }
-
- inline void setWindow(QWindow *win) {
- if (auto oldWin = window.data(); oldWin) {
- oldWin->removeEventFilter(this);
- }
- window = win;
- if (win) {
- win->installEventFilter(this);
- }
- }
-
- protected:
- bool eventFilter(QObject *obj, QEvent *event) override {
- return ctx->sharedDispatch(obj, event);
- }
-
- protected:
- AbstractWindowContext *ctx;
- QPointer<QWindow> window;
- };
-
- }
-
AbstractWindowContext::AbstractWindowContext() = default;
AbstractWindowContext::~AbstractWindowContext() = default;
@@ -56,20 +23,25 @@
m_host = host;
m_delegate.reset(delegate);
m_winIdChangeEventFilter.reset(delegate->createWinIdEventFilter(host, this));
- m_windowEventFilter = std::make_unique<WindowEventFilter>(m_windowHandle, this);
notifyWinIdChange();
}
- 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;
}
@@ -81,7 +53,8 @@
return false;
}
- if (m_systemButtons[button] == obj) {
+ auto org = m_systemButtons[button];
+ if (org == obj) {
return false;
}
m_systemButtons[button] = obj;
@@ -90,18 +63,15 @@
bool AbstractWindowContext::setTitleBar(QObject *item) {
Q_ASSERT(item);
- if (m_titleBar == item) {
+ auto org = m_titleBar;
+ if (org == item) {
return false;
}
- if (m_titleBar) {
+ if (org) {
// Since the title bar is changed, all items inside it should be dereferenced right away
- for (auto &button : m_systemButtons) {
- button = nullptr;
- }
- m_hitTestVisibleItems.clear();
+ removeSystemButtonsAndHitTestItems();
}
-
m_titleBar = item;
return true;
}
@@ -118,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)) {
@@ -152,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;
}
@@ -238,38 +202,42 @@
// 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);
-
- auto windowEventFilter = static_cast<WindowEventFilter *>(m_windowEventFilter.get());
- windowEventFilter->setWindow(nullptr);
+ if (m_windowHandle) {
+ m_windowHandle->installEventFilter(this);
+ }
if (oldWinId != m_windowId) {
winIdChanged(m_windowId, oldWinId);
- }
- if (m_windowHandle) {
- windowEventFilter->setWindow(m_windowHandle);
-
- // Refresh window attributes
- auto attributes = m_windowAttributes;
- m_windowAttributes.clear();
- for (auto it = attributes.begin(); it != attributes.end(); ++it) {
- if (!windowAttributeChanged(it.key(), it.value(), {})) {
- continue;
+ 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;
}
- m_windowAttributes.insert(it.key(), it.value());
}
- }
- // Send to shared dispatchers
- if (oldWinId != m_windowId) {
+ // Send to shared dispatchers
QEvent e(QEvent::WinIdChange);
sharedDispatch(m_host, &e);
}
}
QVariant AbstractWindowContext::windowAttribute(const QString &key) const {
- return m_windowAttributes.value(key);
+ 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) {
@@ -278,25 +246,37 @@
if (!attribute.isValid()) {
return true;
}
- if (!m_windowHandle || !windowAttributeChanged(key, attribute, {})) {
+ if (m_windowId && !windowAttributeChanged(key, attribute, {})) {
return false;
}
- m_windowAttributes.insert(key, attribute);
+ m_windowAttributes.insert(
+ key, m_windowAttributesOrder.insert(m_windowAttributesOrder.end(),
+ std::make_pair(key, attribute)));
return true;
}
- if (it.value() == attribute)
- return true;
- if (!m_windowHandle || !windowAttributeChanged(key, attribute, it.value())) {
+ auto &listIter = it.value();
+ auto &oldAttr = listIter->second;
+ if (m_windowId && !windowAttributeChanged(key, attribute, oldAttr)) {
return false;
}
if (attribute.isValid()) {
- it.value() = attribute;
+ 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,
@@ -305,4 +285,14 @@
return false;
}
+ void AbstractWindowContext::removeSystemButtonsAndHitTestItems() {
+ for (auto &button : m_systemButtons) {
+ if (!button) {
+ continue;
+ }
+ button = nullptr;
+ }
+ m_hitTestVisibleItems.clear();
+ }
+
}
--
Gitblit v1.9.1