From 91274c58b1772dfe38d3fcab291693141e822684 Mon Sep 17 00:00:00 2001
From: Daniel <49284193+dnlkrs@users.noreply.github.com>
Date: 周五, 06 12月 2024 21:55:30 +0800
Subject: [PATCH] Fix WindowsRegistryKey for Qt 6.8.1 (#154)
---
src/core/shared/qwkwindowsextra_p.h | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/core/shared/qwkwindowsextra_p.h b/src/core/shared/qwkwindowsextra_p.h
index 6976b3c..52d8943 100644
--- a/src/core/shared/qwkwindowsextra_p.h
+++ b/src/core/shared/qwkwindowsextra_p.h
@@ -1,4 +1,5 @@
-// Copyright (C) 2023-2024 Stdware Collections
+// 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 QWKWINDOWSEXTRA_P_H
@@ -158,7 +159,7 @@
struct DynamicApis {
static const DynamicApis &instance() {
- static const DynamicApis inst{};
+ static const DynamicApis inst;
return inst;
}
@@ -344,11 +345,8 @@
if (!registry.isValid()) {
return false;
}
- auto value = registry.dwordValue(L"ColorPrevalence");
- if (!value.second) {
- return false;
- }
- return value.first;
+ auto value = registry.value<DWORD>(L"ColorPrevalence");
+ return value.value_or(false);
}
static inline bool isHighContrastModeEnabled() {
@@ -367,11 +365,8 @@
if (!registry.isValid()) {
return false;
}
- auto value = registry.dwordValue(L"AppsUseLightTheme");
- if (!value.second) {
- return false;
- }
- return !value.first;
+ auto value = registry.value<DWORD>(L"AppsUseLightTheme");
+ return value.value_or(false);
#endif
}
@@ -397,13 +392,13 @@
if (!registry.isValid()) {
return {};
}
- auto value = registry.dwordValue(L"AccentColor");
- if (!value.second) {
+ auto value = registry.value<DWORD>(L"AccentColor");
+ if (!value) {
return {};
}
// The retrieved value is in the #AABBGGRR format, we need to
// convert it to the #AARRGGBB format which Qt expects.
- QColor color = QColor::fromRgba(value.first);
+ QColor color = QColor::fromRgba(*value);
if (!color.isValid()) {
return {};
}
@@ -433,7 +428,7 @@
static inline quint32 getSystemMetricsForDpi(int index, quint32 dpi) {
const DynamicApis &apis = DynamicApis::instance();
if (apis.pGetSystemMetricsForDpi) {
- return ::GetSystemMetricsForDpi(index, dpi);
+ return apis.pGetSystemMetricsForDpi(index, dpi);
}
return ::GetSystemMetrics(index);
}
--
Gitblit v1.9.1