sync: from linuxdeepin/dtkdeclarative

deepin-ci-robot · 18202781743 · commit 1396ff2d9807 · 2025-07-24T10:44:58.000+08:00
Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#505
diff --git 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
@@ -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
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -504,6 +504,7 @@ QtObject {`
`504`	`504`	`}`
`505`	`505`
`506`	`506`	`property D.Palette shadowInner2: D.Palette {`
	`507`	`+ normal: Qt.rgba(0, 0, 0, 0.1)`
`507`	`508`	`normalDark: Qt.rgba(1, 1, 1, 0.1)`
`508`	`509`	`}`
`509`	`510`
`@@ -850,6 +851,11 @@ QtObject {`
`850`	`851`	`property D.Palette handleGradientColor: D.Palette {`
`851`	`852`	`normal: D.DTK.makeColor(D.Color.Highlight).hue(-0).saturation(+30).lightness(+30)`
`852`	`853`	`}`
	`854`	`+`
	`855`	`+ property D.Palette background: D.Palette {`
	`856`	`+ normal: Qt.rgba(0, 0, 0, 0.1)`
	`857`	`+ normalDark: Qt.rgba(1, 1, 1, 0.1)`
	`858`	`+ }`
`853`	`859`	`}`
`854`	`860`
`855`	`861`	`property QtObject embeddedProgressBar: QtObject {`
`@@ -861,7 +867,7 @@ QtObject {`
`861`	`867`
`862`	`868`	`property D.Palette background: D.Palette {`
`863`	`869`	`normal: Qt.rgba(0, 0, 0, 0.7)`
`864`		`- normalDark: Qt.rgba(0, 0, 0, 0.2)`
	`870`	`+ normalDark: Qt.rgba(1, 1, 1, 0.2)`
`865`	`871`	`}`
`866`	`872`
`867`	`873`	`property D.Palette progressBackground: D.Palette {`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,9 @@ Item {`
`23`	`23`	`Component {`
`24`	`24`	`id: _normalTextComponent`
`25`	`25`	`Rectangle {`
	`26`	`+ property Palette backgroundColor: DS.Style.progressBar.background`
`26`	`27`	`radius: DS.Style.control.radius`
`27`		`- color: Qt.rgba(0, 0, 0, 0.1);`
	`28`	`+ color: ColorSelector.backgroundColor`
`28`	`29`	`}`
`29`	`30`	`}`
`30`	`31`	`}`