From 6b2d31247dc2c2804e571b31a71c8a423c1db9d4 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 01:44:03 +0800
Subject: [PATCH] Totally fix top border issue on Win10 for QtWidgets
---
src/core/qwindowkit_windows.h | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index ecdb4b1..998939f 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() {
@@ -62,6 +63,26 @@
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() {
@@ -74,6 +95,14 @@
return (rovi.dwMajorVersion > 6) || (rovi.dwMajorVersion == 6 && rovi.dwMinorVersion >= 2);
}
+ inline bool IsWindows10_Real() {
+ return IsWindows10OrGreater_Real() && !IsWindows11OrGreater_Real();
+ }
+
}
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+Q_DECLARE_METATYPE(QMargins)
+#endif
+
#endif // QWINDOWKIT_WINDOWS_H
--
Gitblit v1.9.1