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 | 169 +++++++++----------------------------------------------
1 files changed, 29 insertions(+), 140 deletions(-)
diff --git a/src/core/contexts/qtwindowcontext.cpp b/src/core/contexts/qtwindowcontext.cpp
index 58237c2..a476211 100644
--- a/src/core/contexts/qtwindowcontext.cpp
+++ b/src/core/contexts/qtwindowcontext.cpp
@@ -1,8 +1,13 @@
+// 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>
#include "qwkglobal_p.h"
+#include "systemwindow_p.h"
namespace QWK {
@@ -76,128 +81,9 @@
#endif
}
-#ifdef Q_OS_LINUX
- class WindowMoveManipulator : public QObject {
+ class QtWindowEventFilter : public SharedEventFilter {
public:
- explicit WindowMoveManipulator(QWindow *targetWindow)
- : QObject(targetWindow), target(targetWindow), initialMousePosition(QCursor::pos()),
- initialWindowPosition(targetWindow->position()) {
- target->installEventFilter(this);
- }
-
- protected:
- bool eventFilter(QObject *obj, QEvent *event) override {
- switch (event->type()) {
- case QEvent::MouseMove: {
- auto mouseEvent = static_cast<QMouseEvent *>(event);
- QPoint delta = getMouseEventGlobalPos(mouseEvent) - initialMousePosition;
- target->setPosition(initialWindowPosition + delta);
- return true;
- }
-
- case QEvent::MouseButtonRelease: {
- if (target->y() < 0) {
- target->setPosition(target->x(), 0);
- }
- target->removeEventFilter(this);
- this->deleteLater();
- }
-
- default:
- break;
- }
- return false;
- }
-
- private:
- QWindow *target;
- QPoint initialMousePosition;
- QPoint initialWindowPosition;
- };
-#endif
-
-#if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
- class WindowResizeManipulator : public QObject {
- public:
- WindowResizeManipulator(QWindow *targetWindow, Qt::Edges edges)
- : QObject(targetWindow), target(targetWindow), resizeEdges(edges),
- initialMousePosition(QCursor::pos()), initialWindowRect(target->geometry()) {
- target->installEventFilter(this);
- }
-
- protected:
- bool eventFilter(QObject *obj, QEvent *event) override {
- switch (event->type()) {
- case QEvent::MouseMove: {
- auto mouseEvent = static_cast<QMouseEvent *>(event);
- QPoint globalMousePos = getMouseEventGlobalPos(mouseEvent);
- QRect windowRect = initialWindowRect;
-
- if (resizeEdges & Qt::LeftEdge) {
- int delta = globalMousePos.x() - initialMousePosition.x();
- windowRect.setLeft(initialWindowRect.left() + delta);
- }
- if (resizeEdges & Qt::RightEdge) {
- int delta = globalMousePos.x() - initialMousePosition.x();
- windowRect.setRight(initialWindowRect.right() + delta);
- }
- if (resizeEdges & Qt::TopEdge) {
- int delta = globalMousePos.y() - initialMousePosition.y();
- windowRect.setTop(initialWindowRect.top() + delta);
- }
- if (resizeEdges & Qt::BottomEdge) {
- int delta = globalMousePos.y() - initialMousePosition.y();
- windowRect.setBottom(initialWindowRect.bottom() + delta);
- }
-
- target->setGeometry(windowRect);
- return true;
- }
-
- case QEvent::MouseButtonRelease: {
- target->removeEventFilter(this);
- this->deleteLater();
- }
-
- default:
- break;
- }
- return false;
- }
-
- private:
- QWindow *target;
- QPoint initialMousePosition;
- QRect initialWindowRect;
- Qt::Edges resizeEdges;
- };
-#endif
-
- static inline void startSystemMove(QWindow *window) {
-#ifdef Q_OS_LINUX
- if (window->startSystemMove()) {
- return;
- }
- std::ignore = new WindowMoveManipulator(window);
-#else
- window->startSystemMove();
-#endif
- }
-
- static inline void startSystemResize(QWindow *window, Qt::Edges edges) {
-#if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
- if (window->startSystemResize(edges)) {
- return;
- }
- std::ignore = new WindowResizeManipulator(window, edges);
-#else
- window->startSystemResize(edges);
-#endif
- }
-
- class QtWindowEventFilter : public QObject {
- public:
- explicit QtWindowEventFilter(AbstractWindowContext *context, QObject *parent = nullptr);
+ explicit QtWindowEventFilter(AbstractWindowContext *context);
~QtWindowEventFilter() override;
enum WindowStatus {
@@ -209,7 +95,7 @@
};
protected:
- bool eventFilter(QObject *object, QEvent *event) override;
+ bool sharedEventFilter(QObject *object, QEvent *event) override;
private:
AbstractWindowContext *m_context;
@@ -217,24 +103,25 @@
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;
}
- QObject *host = m_context->host();
- QWindow *window = m_context->window();
- WindowItemDelegate *delegate = m_context->delegate();
- bool fixedSize = delegate->isHostSizeFixed(host);
+ auto host = m_context->host();
+ auto window = m_context->window();
+ auto delegate = m_context->delegate();
auto me = static_cast<const QMouseEvent *>(event);
+ bool fixedSize = m_context->isHostSizeFixed();
QPoint scenePos = getMouseEventScenePos(me);
QPoint globalPos = getMouseEventGlobalPos(me);
@@ -332,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 {
@@ -353,6 +242,7 @@
}
QtWindowContext::QtWindowContext() : AbstractWindowContext() {
+ qtWindowEventFilter = std::make_unique<QtWindowEventFilter>(this);
}
QtWindowContext::~QtWindowContext() = default;
@@ -362,20 +252,19 @@
}
void QtWindowContext::virtual_hook(int id, void *data) {
- switch (id) {
- case ShowSystemMenuHook:
- return;
- default:
- break;
- }
AbstractWindowContext::virtual_hook(id, data);
}
- void QtWindowContext::winIdChanged(QWindow *oldWindow) {
- Q_UNUSED(oldWindow)
+ void QtWindowContext::winIdChanged(WId winId, WId oldWinId) {
+ if (!m_windowHandle) {
+ m_delegate->setWindowFlags(m_host, m_delegate->getWindowFlags(m_host) &
+ ~Qt::FramelessWindowHint);
+ return;
+ }
+
+ // 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