From adb46e1e151b73e56a7e0066a896b48b92a7230e Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: 周五, 22 12月 2023 21:44:10 +0800
Subject: [PATCH] win: use modern API
---
src/core/contexts/win32windowcontext_p.h | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h
index b99314e..d5c6d13 100644
--- a/src/core/contexts/win32windowcontext_p.h
+++ b/src/core/contexts/win32windowcontext_p.h
@@ -1,15 +1,26 @@
#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
+ Q_PROPERTY(bool needBorderPainter READ needBorderPainter FINAL)
+ Q_PROPERTY(int borderThickness READ borderThickness FINAL)
public:
- Win32WindowContext(QWindow *window, WindowItemDelegate *delegate);
+ Win32WindowContext();
~Win32WindowContext() override;
enum WindowPart {
@@ -21,10 +32,22 @@
TitleBar,
};
- public:
- bool setup() override;
+ QString key() const override;
+ void virtual_hook(int id, void *data) override;
+ bool needBorderPainter() const;
+ int borderThickness() const;
+
+ 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
@@ -32,6 +55,12 @@
// Windows messages clearer, we have separated them into this function.
bool snapLayoutHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
LRESULT *result);
+
+ 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;
@@ -42,6 +71,8 @@
// Whether the last mouse leave message is blocked, mainly for handling the unexpected
// WM_MOUSELEAVE.
bool mouseLeaveBlocked = false;
+
+ bool centered = false;
};
}
--
Gitblit v1.9.1