From 2d223770ee33ddf7d93d83bc2cb538bfd66d38d9 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周三, 08 5月 2024 11:30:55 +0800
Subject: [PATCH] update
---
src/core/contexts/win32windowcontext_p.h | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/src/core/contexts/win32windowcontext_p.h b/src/core/contexts/win32windowcontext_p.h
index 9303938..2ea1cf4 100644
--- a/src/core/contexts/win32windowcontext_p.h
+++ b/src/core/contexts/win32windowcontext_p.h
@@ -1,5 +1,18 @@
+// 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 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>
@@ -8,8 +21,6 @@
class Win32WindowContext : public AbstractWindowContext {
Q_OBJECT
- Q_PROPERTY(bool needBorderPainter READ needBorderPainter FINAL)
- Q_PROPERTY(int borderThickness READ borderThickness FINAL)
public:
Win32WindowContext();
~Win32WindowContext() override;
@@ -22,15 +33,17 @@
FixedBorder,
TitleBar,
};
+ Q_ENUM(WindowPart)
QString key() const override;
void virtual_hook(int id, void *data) override;
- bool needBorderPainter() const;
- int borderThickness() const;
+ QVariant windowAttribute(const QString &key) const override;
protected:
- bool setupHost() override;
+ void winIdChanged(WId winId, WId oldWinId) 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);
@@ -39,7 +52,7 @@
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
+ // intercept and emulate most of the mouse events, so that the processing logic
// is quite complex. Simultaneously, in order to make the handling code of other
// Windows messages clearer, we have separated them into this function.
bool snapLayoutHandler(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam,
@@ -52,16 +65,17 @@
LRESULT *result);
protected:
- WId windowId = 0;
-
// The last hit test result, helpful to handle WM_MOUSEMOVE and WM_NCMOUSELEAVE.
WindowPart lastHitTestResult = WindowPart::Outside;
+ int lastHitTestResultRaw = HTNOWHERE;
// Whether the last mouse leave message is blocked, mainly for handling the unexpected
// WM_MOUSELEAVE.
bool mouseLeaveBlocked = false;
- bool centered = false;
+ // For emulating traditional icon button behavior
+ uint64_t iconButtonClickTime = 0;
+ int iconButtonClickLevel = 0;
};
}
--
Gitblit v1.9.1