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/qwindowkit_windows.h | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 154 insertions(+), 5 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index 6462e0b..8b3448b 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -1,18 +1,167 @@
#ifndef QWINDOWKIT_WINDOWS_H
#define QWINDOWKIT_WINDOWS_H
-#include <windows.h>
+#include <QtCore/qt_windows.h>
+#include <QtCore/qglobal.h>
-#include <QString>
+#include <QWKCore/qwkglobal.h>
-#include <QWKCore/qwkcoreglobal.h>
+#ifndef GET_X_LPARAM
+# define GET_X_LPARAM(lp) (static_cast<int>(static_cast<short>(LOWORD(lp))))
+#endif
+
+#ifndef GET_Y_LPARAM
+# define GET_Y_LPARAM(lp) (static_cast<int>(static_cast<short>(HIWORD(lp))))
+#endif
+
+#ifndef IsMinimized
+# define IsMinimized(hwnd) (::IsIconic(hwnd))
+#endif
+
+#ifndef IsMaximized
+# define IsMaximized(hwnd) (::IsZoomed(hwnd))
+#endif
+
+#ifndef RECT_WIDTH
+# define RECT_WIDTH(rect) ((rect).right - (rect).left)
+#endif
+
+#ifndef RECT_HEIGHT
+# define RECT_HEIGHT(rect) ((rect).bottom - (rect).top)
+#endif
+
+// Maybe undocumented Windows messages
+#ifndef WM_UAHDESTROYWINDOW
+# define WM_UAHDESTROYWINDOW (0x0090)
+#endif
+
+#ifndef WM_UNREGISTER_WINDOW_SERVICES
+# define WM_UNREGISTER_WINDOW_SERVICES (0x0272)
+#endif
+
+#ifndef WM_NCUAHDRAWCAPTION
+# define WM_NCUAHDRAWCAPTION (0x00AE)
+#endif
+
+#ifndef WM_NCUAHDRAWFRAME
+# define WM_NCUAHDRAWFRAME (0x00AF)
+#endif
namespace QWK {
- QWK_CORE_EXPORT QString winErrorMessage(DWORD code);
+ namespace Private {
- QWK_CORE_EXPORT QString winLastErrorMessage();
+ QWK_CORE_EXPORT RTL_OSVERSIONINFOW GetRealOSVersion();
+
+ inline bool IsWindows1122H2OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22621);
+ }
+
+ inline bool IsWindows11OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22000);
+ }
+
+ inline bool IsWindows101903OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 18362);
+ }
+
+ inline bool IsWindows101809OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 17763);
+ }
+
+ inline bool IsWindows10OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ }
+
+ inline bool IsWindows8Point1OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 6) ||
+ (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 3);
+ }
+
+ inline bool IsWindows8OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 6) ||
+ (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 2);
+ }
+
+ inline bool IsWindows10_Real() {
+ return IsWindows10OrGreater_Real() && !IsWindows11OrGreater_Real();
+ }
+
+ }
+
+ //
+ // Version Helpers
+ //
+
+ static inline bool isWin8OrGreater() {
+ static const bool result = Private::IsWindows8OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin8Point1OrGreater() {
+ static const bool result = Private::IsWindows8Point1OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin10OrGreater() {
+ static const bool result = Private::IsWindows10OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin101809OrGreater() {
+ static const bool result = Private::IsWindows101809OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin101903OrGreater() {
+ static const bool result = Private::IsWindows101903OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin11OrGreater() {
+ static const bool result = Private::IsWindows11OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin1122H2OrGreater() {
+ static const bool result = Private::IsWindows1122H2OrGreater_Real();
+ return result;
+ }
+
+ static inline bool isWin10() {
+ static const bool result = Private::IsWindows10_Real();
+ return result;
+ };
+
+ //
+ // Native Event Helpers
+ //
+
+ inline bool isImmersiveColorSetChange(WPARAM wParam, LPARAM lParam) {
+ return !wParam && lParam &&
+ std::wcscmp(reinterpret_cast<LPCWSTR>(lParam), L"ImmersiveColorSet") == 0;
+ }
}
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+Q_DECLARE_METATYPE(QMargins)
+#endif
+
#endif // QWINDOWKIT_WINDOWS_H
--
Gitblit v1.9.1