From 56499c70286c0c1b64a45631364c4d745e29abfb Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Mon, 18 Jul 2022 15:16:06 +0800 Subject: [PATCH] fix the widget demo Signed-off-by: Yuhang Zhao <2546789017@qq.com> --- examples/widget/widget.cpp | 7 ++++--- src/core/micamaterial.cpp | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/widget/widget.cpp b/examples/widget/widget.cpp index 7dcd019..8840ccc 100644 --- a/examples/widget/widget.cpp +++ b/examples/widget/widget.cpp @@ -120,12 +120,13 @@ void Widget::updateStyleSheet() { const bool dark = Utils::shouldAppsUseDarkMode(); const QColor clockLabelTextColor = (dark ? kDefaultWhiteColor : kDefaultBlackColor); - m_clockLabel->setStyleSheet(FRAMELESSHELPER_STRING_LITERAL("color: %1;").arg(clockLabelTextColor.name())); + m_clockLabel->setStyleSheet(FRAMELESSHELPER_STRING_LITERAL("background-color: transparent; color: %1;") + .arg(clockLabelTextColor.name())); if (FramelessWidgetsHelper::get(this)->isBlurBehindWindowEnabled()) { - setStyleSheet(FRAMELESSHELPER_STRING_LITERAL("background-color: transparent")); + setStyleSheet(FRAMELESSHELPER_STRING_LITERAL("background-color: transparent;")); } else { const QColor windowBackgroundColor = (dark ? kDefaultSystemDarkColor : kDefaultSystemLightColor); - setStyleSheet(FRAMELESSHELPER_STRING_LITERAL("background-color: %1").arg(windowBackgroundColor.name())); + setStyleSheet(FRAMELESSHELPER_STRING_LITERAL("background-color: %1;").arg(windowBackgroundColor.name())); } update(); } diff --git a/src/core/micamaterial.cpp b/src/core/micamaterial.cpp index 02eb42a..e7afb8a 100644 --- a/src/core/micamaterial.cpp +++ b/src/core/micamaterial.cpp @@ -60,6 +60,8 @@ static constexpr const qreal kDefaultTintOpacity = 0.7; static constexpr const qreal kDefaultNoiseOpacity = 0.04; static constexpr const qreal kDefaultBlurRadius = 128.0; +static Q_CONSTEXPR2 const QColor kDefaultSystemLightColor2 = {243, 243, 243}; // #F3F3F3 + FRAMELESSHELPER_STRING_CONSTANT2(NoiseImageFilePath, ":/org.wangwenx190.FramelessHelper/resources/images/noise.png") struct MicaMaterialData @@ -547,7 +549,7 @@ void MicaMaterialPrivate::updateMaterialBrush() initResource(); static const QImage noiseTexture = QImage(kNoiseImageFilePath); QImage micaTexture = QImage(QSize(64, 64), QImage::Format_ARGB32_Premultiplied); - QColor fillColor = (Utils::shouldAppsUseDarkMode() ? kDefaultSystemDarkColor : kDefaultSystemLightColor); + QColor fillColor = (Utils::shouldAppsUseDarkMode() ? kDefaultSystemDarkColor : kDefaultSystemLightColor2); fillColor.setAlphaF(0.9f); micaTexture.fill(fillColor); QPainter painter(&micaTexture);