[vlc-commits] qml: fix foreground color handling in IconToolButton

Prince Gupta git at videolan.org
Mon Feb 8 10:00:22 UTC 2021


vlc | branch: master | Prince Gupta <guptaprince8832 at gmail.com> | Tue Jan 19 21:27:01 2021 +0530| [65f65ef0e0b46155fe48c2c1d4b7078877963384] | committer: Pierre Lamot

qml: fix foreground color handling in IconToolButton

use focusbackground.foregroundColor property for foreground color since it's animated based on the background color

Signed-off-by: Pierre Lamot <pierre at videolabs.io>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=65f65ef0e0b46155fe48c2c1d4b7078877963384
---

 modules/gui/qt/widgets/qml/IconToolButton.qml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt/widgets/qml/IconToolButton.qml b/modules/gui/qt/widgets/qml/IconToolButton.qml
index 08cfc76ca3..dfb1c179a5 100644
--- a/modules/gui/qt/widgets/qml/IconToolButton.qml
+++ b/modules/gui/qt/widgets/qml/IconToolButton.qml
@@ -29,7 +29,7 @@ ToolButton {
     padding: 0
 
     property string iconText: ""
-    property color color: focusBackground.foregroundColor
+    property alias color: focusBackground.defaultForeground
     property color colorDisabled: VLCStyle.colors.textInactive
     property color colorOverlay: "transparent"
     property string textOverlay: ""
@@ -55,7 +55,7 @@ ToolButton {
         Label {
             id: text
             text: control.iconText
-            color: control.enabled ? control.color : control.colorDisabled
+            color: control.enabled ? focusBackground.foregroundColor : control.colorDisabled
 
             anchors.centerIn: parent
 
@@ -86,7 +86,7 @@ ToolButton {
 
             Label {
                 text: VLCIcons.active_indicator
-                color: control.enabled ? control.color : control.colorDisabled
+                color: control.enabled ?  focusBackground.foregroundColor : control.colorDisabled
                 visible: !control.paintOnly && control.checked
 
                 anchors.centerIn: parent



More information about the vlc-commits mailing list