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_p.h | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/src/core/contexts/abstractwindowcontext_p.h b/src/core/contexts/abstractwindowcontext_p.h
index 13490f3..dc18f37 100644
--- a/src/core/contexts/abstractwindowcontext_p.h
+++ b/src/core/contexts/abstractwindowcontext_p.h
@@ -1,4 +1,5 @@
-// Copyright (C) 2023-2024 Stdware Collections
+// Copyright (C) 2023-2024 Stdware Collections (https://www.github.com/stdware)
+// Copyright (C) 2021-2023 wangwenx190 (Yuhang Zhao)
// SPDX-License-Identifier: Apache-2.0
#ifndef ABSTRACTWINDOWCONTEXT_P_H
@@ -14,7 +15,9 @@
//
#include <array>
+#include <list>
#include <memory>
+#include <utility>
#include <QtCore/QSet>
#include <QtCore/QPointer>
@@ -25,6 +28,7 @@
#include <QWKCore/private/nativeeventfilter_p.h>
#include <QWKCore/private/sharedeventfilter_p.h>
#include <QWKCore/private/windowitemdelegate_p.h>
+#include <QWKCore/private/winidchangeeventfilter_p.h>
namespace QWK {
@@ -41,10 +45,11 @@
inline QObject *host() const;
inline QWindow *window() const;
+ inline WId windowId() const;
inline WindowItemDelegate *delegate() const;
inline bool isHitTestVisible(const QObject *obj) const;
- bool setHitTestVisible(const QObject *obj, bool visible);
+ bool setHitTestVisible(QObject *obj, bool visible);
inline QObject *systemButton(WindowAgentBase::SystemButton button) const;
bool setSystemButton(WindowAgentBase::SystemButton button, QObject *obj);
@@ -60,6 +65,24 @@
bool isInSystemButtons(const QPoint &pos, WindowAgentBase::SystemButton *button) const;
bool isInTitleBarDraggableArea(const QPoint &pos) const;
+ inline bool isHostWidthFixed() const {
+ return m_windowHandle
+ ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+ m_windowHandle->minimumWidth() == m_windowHandle->maximumWidth())
+ : false;
+ }
+ inline bool isHostHeightFixed() const {
+ return m_windowHandle
+ ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+ m_windowHandle->minimumHeight() == m_windowHandle->maximumHeight())
+ : false;
+ }
+ inline bool isHostSizeFixed() const {
+ return m_windowHandle ? ((m_windowHandle->flags() & Qt::MSWindowsFixedSizeDialogHint) ||
+ m_windowHandle->minimumSize() == m_windowHandle->maximumSize())
+ : false;
+ }
+
virtual QString key() const;
enum WindowContextHook {
@@ -67,9 +90,9 @@
RaiseWindowHook,
ShowSystemMenuHook,
DefaultColorsHook,
- DrawWindows10BorderHook, // Only works on Windows 10, emulated workaround
- DrawWindows10BorderHook2, // Only works on Windows 10, native workaround
- SystemButtonAreaChangedHook, // Only works on Mac
+ DrawWindows10BorderHook_Emulated, // Only works on Windows 10, emulated workaround
+ DrawWindows10BorderHook_Native, // Only works on Windows 10, native workaround
+ SystemButtonAreaChangedHook, // Only works on Mac
};
virtual void virtual_hook(int id, void *data);
@@ -80,27 +103,33 @@
virtual bool setWindowAttribute(const QString &key, const QVariant &attribute);
protected:
- virtual void winIdChanged() = 0;
+ bool eventFilter(QObject *obj, QEvent *event) override;
+
+ protected:
+ virtual void winIdChanged(WId winId, WId oldWinId) = 0;
virtual bool windowAttributeChanged(const QString &key, const QVariant &attribute,
const QVariant &oldAttribute);
protected:
QObject *m_host{};
std::unique_ptr<WindowItemDelegate> m_delegate;
- QWindow *m_windowHandle{};
+ QPointer<QWindow> m_windowHandle;
+ WId m_windowId{};
- QSet<const QObject *> m_hitTestVisibleItems;
+ QVector<QPointer<QObject>> m_hitTestVisibleItems;
#ifdef Q_OS_MAC
ScreenRectCallback m_systemButtonAreaCallback;
#endif
- QObject *m_titleBar{};
- std::array<QObject *, WindowAgentBase::Close + 1> m_systemButtons{};
+ QPointer<QObject> m_titleBar{};
+ std::array<QPointer<QObject>, WindowAgentBase::Close + 1> m_systemButtons{};
- QVariantHash m_windowAttributes;
+ std::list<std::pair<QString, QVariant>> m_windowAttributesOrder;
+ QHash<QString, decltype(m_windowAttributesOrder)::iterator> m_windowAttributes;
- std::unique_ptr<QObject> m_windowEventFilter;
- std::unique_ptr<QObject> m_winIdChangeEventFilter;
+ std::unique_ptr<WinIdChangeEventFilter> m_winIdChangeEventFilter;
+
+ void removeSystemButtonsAndHitTestItems();
};
inline QObject *AbstractWindowContext::host() const {
@@ -111,12 +140,16 @@
return m_windowHandle;
}
+ inline WId AbstractWindowContext::windowId() const {
+ return m_windowId;
+ }
+
inline WindowItemDelegate *AbstractWindowContext::delegate() const {
return m_delegate.get();
}
inline bool AbstractWindowContext::isHitTestVisible(const QObject *obj) const {
- return m_hitTestVisibleItems.contains(obj);
+ return m_hitTestVisibleItems.contains(const_cast<QObject *>(obj));
}
inline QObject *
--
Gitblit v1.9.1