From fee0c64a8f8d6237f94457b608cc09614514f9b5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周六, 23 12月 2023 15:00:35 +0800
Subject: [PATCH] Fix window overflow
---
examples/mainwindow/mainwindow.cpp | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/examples/mainwindow/mainwindow.cpp b/examples/mainwindow/mainwindow.cpp
index 7faf057..86420ac 100644
--- a/examples/mainwindow/mainwindow.cpp
+++ b/examples/mainwindow/mainwindow.cpp
@@ -143,7 +143,9 @@
auto dwmBlurAction = new QAction(tr("Enable DWM blur"), menuBar);
dwmBlurAction->setCheckable(true);
connect(dwmBlurAction, &QAction::triggered, this, [this](bool checked) {
- windowAgent->setWindowAttribute(QStringLiteral("dwm-blur"), checked);
+ if (!windowAgent->setWindowAttribute(QStringLiteral("dwm-blur"), checked)) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -151,7 +153,10 @@
auto acrylicAction = new QAction(tr("Enable acrylic material"), menuBar);
acrylicAction->setCheckable(true);
connect(acrylicAction, &QAction::triggered, this, [this](bool checked) {
- windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"), QColor::fromRgbF(1.f, 1.f, 1.f, 0.6f));
+ if (!windowAgent->setWindowAttribute(QStringLiteral("acrylic-material"),
+ QColor::fromRgbF(1.f, 1.f, 1.f, 0.6f))) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -159,7 +164,9 @@
auto micaAction = new QAction(tr("Enable mica"), menuBar);
micaAction->setCheckable(true);
connect(micaAction, &QAction::triggered, this, [this](bool checked) {
- windowAgent->setWindowAttribute(QStringLiteral("mica"), checked);
+ if (!windowAgent->setWindowAttribute(QStringLiteral("mica"), checked)) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -167,7 +174,9 @@
auto micaAltAction = new QAction(tr("Enable mica alt"), menuBar);
micaAltAction->setCheckable(true);
connect(micaAltAction, &QAction::triggered, this, [this](bool checked) {
- windowAgent->setWindowAttribute(QStringLiteral("mica-alt"), checked);
+ if (!windowAgent->setWindowAttribute(QStringLiteral("mica-alt"), checked)) {
+ return;
+ }
setProperty("custom-style", checked);
style()->polish(this);
});
@@ -291,6 +300,10 @@
return;
currentTheme = theme;
+#ifdef Q_OS_WIN
+ windowAgent->setWindowAttribute(QStringLiteral("dark-mode"), currentTheme == Dark);
+#endif
+
if (QFile qss(theme == Dark ? QStringLiteral(":/dark-style.qss")
: QStringLiteral(":/light-style.qss"));
qss.open(QIODevice::ReadOnly | QIODevice::Text)) {
--
Gitblit v1.9.1