From 953ebc40a8e26a388c454f7b05c598d5690840bc Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 26 12月 2023 17:01:06 +0800
Subject: [PATCH] minor tweaks
---
src/widgets/widgetwindowagent_win.cpp | 4 ++--
qmsetup | 2 +-
src/core/CMakeLists.txt | 2 +-
src/CMakeLists.txt | 3 ---
CMakeLists.txt | 1 -
5 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0d9873..44aabdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,6 @@
option(QWINDOWKIT_INSTALL "Install library" ON)
option(QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT "Enable Qt Window Context anyway" OFF)
-option(QWINDOWKIT_ENABLE_STYLE_AGENT "Enable building style agent" ON)
option(QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER "Enable system border on Windows" ON)
# ----------------------------------
diff --git a/qmsetup b/qmsetup
index 17be544..e3adbec 160000
--- a/qmsetup
+++ b/qmsetup
@@ -1 +1 @@
-Subproject commit 17be544bc9fd7b6c45a0bf77256655782488b898
+Subproject commit e3adbec9c560679894ed1768892346e8f418a71f
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 97a7669..dddf76a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,9 +17,6 @@
qm_add_definition(QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT
CONDITION QWINDOWKIT_ENABLE_QT_WINDOW_CONTEXT
)
-qm_add_definition(QWINDOWKIT_ENABLE_STYLE_AGENT
- CONDITION QWINDOWKIT_ENABLE_STYLE_AGENT
-)
qm_add_definition(QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER
CONDITION QWINDOWKIT_ENABLE_WINDOWS_SYSTEM_BORDER
)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index e801dd2..c00cea0 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -65,7 +65,7 @@
endif()
endif()
-if(QWINDOWKIT_ENABLE_STYLE_AGENT)
+if(TRUE)
list(APPEND _src
style/styleagent.h
style/styleagent_p.h
diff --git a/src/widgets/widgetwindowagent_win.cpp b/src/widgets/widgetwindowagent_win.cpp
index 0f88e1c..52cc5ef 100644
--- a/src/widgets/widgetwindowagent_win.cpp
+++ b/src/widgets/widgetwindowagent_win.cpp
@@ -45,7 +45,7 @@
ctx->setWindowAttribute(QStringLiteral("extra-margins"), defaultMargins);
// Enable dark mode by default, otherwise the frame borders are white
- ctx->setWindowAttribute(QStringLiteral("dark-mode"), true);
+ // ctx->setWindowAttribute(QStringLiteral("dark-mode"), true);
ctx->installNativeEventFilter(this);
ctx->installSharedEventFilter(this);
@@ -148,7 +148,7 @@
// ignore it.
if (event->type() == QEvent::Expose) {
auto ee = static_cast<QExposeEvent *>(event);
- if (window->isExposed() && !ee->region().isNull()) {
+ if (window->isExposed() && isNormalWindow() && !ee->region().isNull()) {
resumeWindowEvent(window, event);
return true;
}
--
Gitblit v1.9.1