From 133bb82b40965318558a61321585a9174bc99d52 Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Wed, 23 Jul 2025 04:18:24 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/505 --- qt6/src/qml/FlowStyle.qml | 8 +++++++- qt6/src/qml/private/ProgressBarPanel.qml | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/qt6/src/qml/FlowStyle.qml b/qt6/src/qml/FlowStyle.qml index 19751853..2824b46d 100644 --- a/qt6/src/qml/FlowStyle.qml +++ b/qt6/src/qml/FlowStyle.qml @@ -504,6 +504,7 @@ QtObject { } property D.Palette shadowInner2: D.Palette { + normal: Qt.rgba(0, 0, 0, 0.1) normalDark: Qt.rgba(1, 1, 1, 0.1) } @@ -850,6 +851,11 @@ QtObject { property D.Palette handleGradientColor: D.Palette { normal: D.DTK.makeColor(D.Color.Highlight).hue(-0).saturation(+30).lightness(+30) } + + property D.Palette background: D.Palette { + normal: Qt.rgba(0, 0, 0, 0.1) + normalDark: Qt.rgba(1, 1, 1, 0.1) + } } property QtObject embeddedProgressBar: QtObject { @@ -861,7 +867,7 @@ QtObject { property D.Palette background: D.Palette { normal: Qt.rgba(0, 0, 0, 0.7) - normalDark: Qt.rgba(0, 0, 0, 0.2) + normalDark: Qt.rgba(1, 1, 1, 0.2) } property D.Palette progressBackground: D.Palette { diff --git a/qt6/src/qml/private/ProgressBarPanel.qml b/qt6/src/qml/private/ProgressBarPanel.qml index a40f365f..c2023474 100644 --- a/qt6/src/qml/private/ProgressBarPanel.qml +++ b/qt6/src/qml/private/ProgressBarPanel.qml @@ -23,8 +23,9 @@ Item { Component { id: _normalTextComponent Rectangle { + property Palette backgroundColor: DS.Style.progressBar.background radius: DS.Style.control.radius - color: Qt.rgba(0, 0, 0, 0.1); + color: ColorSelector.backgroundColor } } }