From 1740ed5e0e765ebd8676733243eb3eaa81f95df1 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 17:32:13 +0800
Subject: [PATCH] Fix window visibility inconsistency
---
src/core/contexts/win32windowcontext_p.h | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h
index 0d7b14b..ca64faf 100644
--- a/src/core/contexts/win32windowcontext_p.h
+++ b/src/core/contexts/win32windowcontext_p.h
@@ -1,12 +1,21 @@
#ifndef WIN32WINDOWCONTEXT_P_H
#define WIN32WINDOWCONTEXT_P_H
+//
+// W A R N I N G !!!
+// -----------------
+//
+// This file is not part of the QWindowKit API. It is used purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or may even be removed.
+//
+
#include <QWKCore/qwindowkit_windows.h>
#include <QWKCore/private/abstractwindowcontext_p.h>
namespace QWK {
- class QWK_CORE_EXPORT Win32WindowContext : public AbstractWindowContext {
+ class Win32WindowContext : public AbstractWindowContext {
Q_OBJECT
public:
Win32WindowContext();
@@ -21,10 +30,21 @@
TitleBar,
};
- public:
- bool setup(QObject *host, WindowItemDelegate *delegate) override;
+ QString key() const override;
+ void virtual_hook(int id, void *data) override;
+ QVariant windowAttribute(const QString &key) const override;
+
+ protected:
+ void winIdChanged() override;
+ bool windowAttributeChanged(const QString &key, const QVariant &attribute,
+ const QVariant &oldAttribute) override;
+
+ public:
bool windowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result);
+
+ bool systemMenuHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
+ LRESULT *result);
// In order to perfectly apply Windows 11 Snap Layout into the Qt window, we need to
// intercept and simulate most of the mouse events, so that the processing logic
@@ -36,6 +56,9 @@
bool customWindowHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
LRESULT *result);
+ bool nonClientCalcSizeHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
+ LRESULT *result);
+
protected:
WId windowId = 0;
@@ -46,7 +69,7 @@
// WM_MOUSELEAVE.
bool mouseLeaveBlocked = false;
- bool centered = false;
+ bool initialCentered = false;
};
}
--
Gitblit v1.9.1