From 430d245bb94c634047e7b65232eb3e50e2b6e49a Mon Sep 17 00:00:00 2001
From: Zhao Yuhang <2546789017@qq.com>
Date: ćšć, 21 12æ 2023 22:00:37 +0800
Subject: [PATCH] add more attrib
---
src/core/qwindowkit_windows.h | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index ecdb4b1..ad691a7 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -4,7 +4,7 @@
#include <QtCore/qt_windows.h>
#include <QtCore/qglobal.h>
-#include <QWKCore/qwkcoreglobal.h>
+#include <QWKCore/qwkglobal.h>
#ifndef GET_X_LPARAM
# define GET_X_LPARAM(lp) (static_cast<int>(static_cast<short>(LOWORD(lp))))
@@ -15,11 +15,11 @@
#endif
#ifndef IsMinimized
-# define IsMinimized(hwnd) (::IsIconic(hwnd) != FALSE)
+# define IsMinimized(hwnd) (::IsIconic(hwnd))
#endif
#ifndef IsMaximized
-# define IsMaximized(hwnd) (::IsZoomed(hwnd) != FALSE)
+# define IsMaximized(hwnd) (::IsZoomed(hwnd))
#endif
#ifndef RECT_WIDTH
@@ -51,10 +51,11 @@
QWK_CORE_EXPORT RTL_OSVERSIONINFOW GetRealOSVersion();
- inline bool IsWindows10OrGreater_Real() {
+ inline bool IsWindows1122H2OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
+ rovi.dwBuildNumber >= 22621);
}
inline bool IsWindows11OrGreater_Real() {
@@ -64,6 +65,12 @@
rovi.dwBuildNumber >= 22000);
}
+ 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);
--
Gitblit v1.9.1