vlc | branch: master | Pierre Lamot <[email protected]> | Fri Aug 2 10:41:22 2019 +0200| [fa388ad30509404c6be30a5b9168f19dad0fdaf3] | committer: Jean-Baptiste Kempf
qml: allow forcing colors of IconToolButton widget > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fa388ad30509404c6be30a5b9168f19dad0fdaf3 --- modules/gui/qt/qml/utils/IconToolButton.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt/qml/utils/IconToolButton.qml b/modules/gui/qt/qml/utils/IconToolButton.qml index 57dc3e4128..ce8cac4397 100644 --- a/modules/gui/qt/qml/utils/IconToolButton.qml +++ b/modules/gui/qt/qml/utils/IconToolButton.qml @@ -23,8 +23,6 @@ import "qrc:///style/" ToolButton { id: control property bool paintOnly: false - property color color: control.enabled || paintOnly? - VLCStyle.colors.buttonText : VLCStyle.colors.lightText property int size: VLCStyle.icon_normal @@ -32,6 +30,8 @@ ToolButton { padding: 0 + property color color: VLCStyle.colors.buttonText + property color colorDisabled: VLCStyle.colors.lightText property color colorOverlay: "transparent" property string textOverlay: "" property bool borderEnabled: false @@ -55,7 +55,7 @@ ToolButton { Label { id: text text: control.text - color: control.color + color: control.enabled ? control.color : control.colorDisabled anchors.centerIn: parent _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
