From 7946ce46e5ec42b4a1510b9dc6a33a28d8febe4e Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sun, 10 Apr 2016 05:28:57 +0400 Subject: Material style: Fix color of disabled Label and PageIndicator Change-Id: Iec1762d4abed06ee6713288af9007dbebd7bfa6a Reviewed-by: J-P Nurmi --- src/imports/controls/material/Label.qml | 2 +- src/imports/controls/material/PageIndicator.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml index 3d8952f2..945c0d4f 100644 --- a/src/imports/controls/material/Label.qml +++ b/src/imports/controls/material/Label.qml @@ -41,6 +41,6 @@ import Qt.labs.controls.material 1.0 T.Label { id: control - color: Material.primaryTextColor + color: enabled ? Material.primaryTextColor : Material.hintTextColor linkColor: Material.accentColor } diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 1d646f97..b1365368 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -55,7 +55,7 @@ T.PageIndicator { implicitHeight: 8 radius: width / 2 - color: control.Material.primaryTextColor + color: control.enabled ? control.Material.primaryTextColor : control.Material.hintTextColor opacity: index === currentIndex ? 0.95 : pressed ? 0.7 : 0.45 Behavior on opacity { OpacityAnimator { duration: 100 } } -- cgit v1.2.3