From 245ddfa1f01b4c9fa10337246b8045755e5bcce5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 21:03:58 +0800
Subject: [PATCH] Change back to qScopeGuard
---
src/core/qwindowkit_windows.h | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index 1c47ccf..17e2387 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -4,14 +4,7 @@
#include <QtCore/qt_windows.h>
#include <QtCore/qglobal.h>
-// MOC can't handle C++ attributes before 5.15.
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
-# define Q_NODISCARD [[nodiscard]]
-# define Q_MAYBE_UNUSED [[maybe_unused]]
-#else
-# define Q_NODISCARD
-# define Q_MAYBE_UNUSED
-#endif
+#include <QWKCore/qwkglobal.h>
#ifndef GET_X_LPARAM
# define GET_X_LPARAM(lp) (static_cast<int>(static_cast<short>(LOWORD(lp))))
@@ -19,6 +12,22 @@
#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
@@ -30,4 +39,41 @@
# 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 RTL_OSVERSIONINFOW GetRealOSVersion();
+
+ inline bool IsWindows10OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ }
+
+ inline bool IsWindows11OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22000);
+ }
+
+ 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);
+ }
+
+}
+
#endif // QWINDOWKIT_WINDOWS_H
--
Gitblit v1.9.1