From 9dcea027f16c4ce5852da3dfc8aca284c582bd7d Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu.greentest.com.cn>
Date: 周五, 06 6月 2025 18:19:18 +0800
Subject: [PATCH] 1.注释掉custom margin，解决程序放大后，遮盖窗口底部内容的问题。
---
src/core/qwindowkit_windows.h | 122 +++++++++++++++++++++++++++++++---------
1 files changed, 93 insertions(+), 29 deletions(-)
diff --git a/src/core/qwindowkit_windows.h b/src/core/qwindowkit_windows.h
index c84f50d..aad3775 100644
--- a/src/core/qwindowkit_windows.h
+++ b/src/core/qwindowkit_windows.h
@@ -1,5 +1,17 @@
+// 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 QWINDOWKIT_WINDOWS_H
#define QWINDOWKIT_WINDOWS_H
+
+#ifndef _USER32_
+# define _USER32_
+#endif
+
+#ifndef _DWMAPI_
+# define _DWMAPI_
+#endif
#include <QtCore/qt_windows.h>
#include <QtCore/qglobal.h>
@@ -18,14 +30,6 @@
# 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
@@ -34,7 +38,13 @@
# define RECT_HEIGHT(rect) ((rect).bottom - (rect).top)
#endif
+#ifndef USER_DEFAULT_SCREEN_DPI
+# define USER_DEFAULT_SCREEN_DPI (96)
+#endif
+
// Maybe undocumented Windows messages
+// https://github.com/tinysec/public/blob/master/win32k/MessageTable.md
+// https://ulib.sourceforge.io/doxy/a00239.html
#ifndef WM_UAHDESTROYWINDOW
# define WM_UAHDESTROYWINDOW (0x0090)
#endif
@@ -60,35 +70,53 @@
inline bool IsWindows1122H2OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 22621);
+ (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);
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 22000));
+ }
+
+ inline bool IsWindows1020H1OrGreater_Real() {
+ RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
+ return (rovi.dwMajorVersion > 10) ||
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 19041));
+ }
+
+ inline bool IsWindows102004OrGreater_Real() {
+ return IsWindows1020H1OrGreater_Real();
}
inline bool IsWindows101903OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 18362);
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 18362));
+ }
+
+ inline bool IsWindows1019H1OrGreater_Real() {
+ return IsWindows101903OrGreater_Real();
}
inline bool IsWindows101809OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0 &&
- rovi.dwBuildNumber >= 17763);
+ (rovi.dwMajorVersion == 10 &&
+ (rovi.dwMinorVersion > 0 || rovi.dwBuildNumber >= 17763));
+ }
+
+ inline bool IsWindows10RS5OrGreater_Real() {
+ return IsWindows101809OrGreater_Real();
}
inline bool IsWindows10OrGreater_Real() {
RTL_OSVERSIONINFOW rovi = GetRealOSVersion();
- return (rovi.dwMajorVersion > 10) ||
- (rovi.dwMajorVersion == 10 && rovi.dwMinorVersion >= 0);
+ return rovi.dwMajorVersion >= 10;
}
inline bool IsWindows8Point1OrGreater_Real() {
@@ -112,6 +140,7 @@
//
// Registry Helpers
//
+
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
class QWK_CORE_EXPORT WindowsRegistryKey {
public:
@@ -120,11 +149,11 @@
~WindowsRegistryKey();
- inline bool isValid() const;
+ bool isValid() const;
void close();
QString stringValue(QStringView subKey) const;
- QPair<DWORD, bool> dwordValue(QStringView subKey) const;
+ std::pair<DWORD, bool> dwordValue(QStringView subKey) const;
private:
HKEY m_key;
@@ -135,50 +164,85 @@
inline bool WindowsRegistryKey::isValid() const {
return m_key != nullptr;
}
-#else
+#elif QT_VERSION < QT_VERSION_CHECK(6, 8, 1)
using WindowsRegistryKey = QWinRegistryKey;
+#else
+ class WindowsRegistryKey : public QWinRegistryKey {
+ public:
+ WindowsRegistryKey(HKEY parentHandle, QStringView subKey, REGSAM permissions = KEY_READ,
+ REGSAM access = 0)
+ : QWinRegistryKey(parentHandle, subKey, permissions, access) {
+ }
+
+ inline std::pair<DWORD, bool> dwordValue(QStringView subKey) const;
+ };
+
+ inline std::pair<DWORD, bool> WindowsRegistryKey::dwordValue(QStringView subKey) const {
+ const auto val = value<DWORD>(subKey);
+ if (!val) {
+ return {0, false};
+ }
+ return {val.value(), true};
+ }
#endif
//
// Version Helpers
//
- static inline bool isWin8OrGreater() {
+ inline bool isWin8OrGreater() {
static const bool result = Private::IsWindows8OrGreater_Real();
return result;
}
- static inline bool isWin8Point1OrGreater() {
+ inline bool isWin8Point1OrGreater() {
static const bool result = Private::IsWindows8Point1OrGreater_Real();
return result;
}
- static inline bool isWin10OrGreater() {
+ inline bool isWin10OrGreater() {
static const bool result = Private::IsWindows10OrGreater_Real();
return result;
}
- static inline bool isWin101809OrGreater() {
+ inline bool isWin101809OrGreater() {
static const bool result = Private::IsWindows101809OrGreater_Real();
return result;
}
- static inline bool isWin101903OrGreater() {
+ inline bool isWin10RS5OrGreater() {
+ return isWin101809OrGreater();
+ }
+
+ inline bool isWin101903OrGreater() {
static const bool result = Private::IsWindows101903OrGreater_Real();
return result;
}
- static inline bool isWin11OrGreater() {
+ inline bool isWin1019H1OrGreater() {
+ return isWin101903OrGreater();
+ }
+
+ inline bool isWin1020H1OrGreater() {
+ static const bool result = Private::IsWindows1020H1OrGreater_Real();
+ return result;
+ }
+
+ inline bool isWin102004OrGreater() {
+ return isWin1020H1OrGreater();
+ }
+
+ inline bool isWin11OrGreater() {
static const bool result = Private::IsWindows11OrGreater_Real();
return result;
}
- static inline bool isWin1122H2OrGreater() {
+ inline bool isWin1122H2OrGreater() {
static const bool result = Private::IsWindows1122H2OrGreater_Real();
return result;
}
- static inline bool isWin10Only() {
+ inline bool isWin10Only() {
static const bool result = Private::IsWindows10Only_Real();
return result;
};
--
Gitblit v1.9.1