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/qtwindowcontext.cpp | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/core/contexts/qtwindowcontext.cpp b/src/core/contexts/qtwindowcontext.cpp
index d0abb6d..a476211 100644
--- a/src/core/contexts/qtwindowcontext.cpp
+++ b/src/core/contexts/qtwindowcontext.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 "qtwindowcontext_p.h"
#include <QtCore/QDebug>
@@ -77,9 +81,9 @@
#endif
}
- class QtWindowEventFilter : public QObject {
+ class QtWindowEventFilter : public SharedEventFilter {
public:
- explicit QtWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ explicit QtWindowEventFilter(AbstractWindowContext *context);
~QtWindowEventFilter() override;
enum WindowStatus {
@@ -91,7 +95,7 @@
};
protected:
- bool eventFilter(QObject *object, QEvent *event) override;
+ bool sharedEventFilter(QObject *object, QEvent *event) override;
private:
AbstractWindowContext *m_context;
@@ -99,15 +103,16 @@
WindowStatus m_windowStatus;
};
- QtWindowEventFilter::QtWindowEventFilter(AbstractWindowContext *context, QObject *parent)
- : QObject(parent), m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
- m_context->window()->installEventFilter(this);
+ QtWindowEventFilter::QtWindowEventFilter(AbstractWindowContext *context)
+ : m_context(context), m_cursorShapeChanged(false), m_windowStatus(Idle) {
+ m_context->installSharedEventFilter(this);
}
QtWindowEventFilter::~QtWindowEventFilter() = default;
- bool QtWindowEventFilter::eventFilter(QObject *obj, QEvent *event) {
+ bool QtWindowEventFilter::sharedEventFilter(QObject *obj, QEvent *event) {
Q_UNUSED(obj)
+
auto type = event->type();
if (type < QEvent::MouseButtonPress || type > QEvent::MouseMove) {
return false;
@@ -116,7 +121,7 @@
auto window = m_context->window();
auto delegate = m_context->delegate();
auto me = static_cast<const QMouseEvent *>(event);
- bool fixedSize = delegate->isHostSizeFixed(host);
+ bool fixedSize = m_context->isHostSizeFixed();
QPoint scenePos = getMouseEventScenePos(me);
QPoint globalPos = getMouseEventGlobalPos(me);
@@ -214,8 +219,10 @@
case QEvent::MouseButtonDblClick: {
if (me->button() == Qt::LeftButton && inTitleBar && !fixedSize) {
+ 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 {
@@ -235,6 +242,7 @@
}
QtWindowContext::QtWindowContext() : AbstractWindowContext() {
+ qtWindowEventFilter = std::make_unique<QtWindowEventFilter>(this);
}
QtWindowContext::~QtWindowContext() = default;
@@ -247,14 +255,7 @@
AbstractWindowContext::virtual_hook(id, data);
}
- void QtWindowContext::winIdChanged(QWindow *oldWindow, bool isDestroyed) {
- Q_UNUSED(isDestroyed)
-
- // If the original window id is valid, remove all resources related
- if (oldWindow) {
- qtWindowEventFilter.reset();
- }
-
+ void QtWindowContext::winIdChanged(WId winId, WId oldWinId) {
if (!m_windowHandle) {
m_delegate->setWindowFlags(m_host, m_delegate->getWindowFlags(m_host) &
~Qt::FramelessWindowHint);
@@ -264,7 +265,6 @@
// Allocate new resources
m_delegate->setWindowFlags(m_host,
m_delegate->getWindowFlags(m_host) | Qt::FramelessWindowHint);
- qtWindowEventFilter = std::make_unique<QtWindowEventFilter>(this);
}
}
--
Gitblit v1.9.1