From e9476ae5b9385ce5a6b4a55f984543aa180492bd Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 24 Apr 2015 01:02:24 +0200 Subject: Use Theme.disabledColor to get sensible looks in disabled state Change-Id: I28831c979f8fa040fc3388eec6f2256930a3d91d Reviewed-by: J-P Nurmi --- src/imports/controls/Button.qml | 8 +++----- src/imports/controls/CheckBox.qml | 11 +++++------ src/imports/controls/GroupBox.qml | 3 +-- src/imports/controls/ProgressBar.qml | 2 +- src/imports/controls/RadioButton.qml | 11 +++++------ src/imports/controls/Slider.qml | 8 ++++---- src/imports/controls/Switch.qml | 11 +++++------ src/imports/controls/TabButton.qml | 3 +-- src/imports/controls/TextArea.qml | 2 +- src/imports/controls/TextField.qml | 3 +-- src/imports/controls/ToggleButton.qml | 11 +++++------ src/imports/controls/ToolButton.qml | 3 +-- 12 files changed, 33 insertions(+), 43 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 0dd9b6ee..6ce91739 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -60,7 +60,6 @@ AbstractButton { text: control.text color: control.Theme.selectedTextColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } @@ -70,9 +69,8 @@ AbstractButton { implicitHeight: 26 radius: control.Theme.roundness - opacity: control.enabled ? 1.0 : control.Theme.disabledOpacity - color: Qt.tint(Qt.tint(control.Theme.accentColor, - control.activeFocus ? control.Theme.focusColor : "transparent"), - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.tint(!control.enabled ? control.Theme.disabledColor : + control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor, + control.pressed ? control.Theme.pressColor : "transparent") } } diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 0a8facf1..f149bcbb 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -66,7 +66,6 @@ AbstractCheckBox { radius: control.Theme.roundness border.width: control.activeFocus ? 2 : 1 border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor - opacity: enabled ? 1.0 : control.Theme.disabledOpacity color: control.Theme.backgroundColor Rectangle { @@ -74,9 +73,10 @@ AbstractCheckBox { y: (parent.height - height) / 2 width: 12 height: 12 - color: Qt.tint(Qt.tint(control.checked ? control.Theme.accentColor : control.Theme.baseColor, - control.checked && control.activeFocus ? control.Theme.focusColor : "transparent"), - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.tint(control.checked && !control.enabled ? control.Theme.disabledColor : + control.checked && control.activeFocus ? control.Theme.focusColor : + control.checked ? control.Theme.accentColor : control.Theme.baseColor, + control.pressed ? control.Theme.pressColor : "transparent") border.width: control.checked || control.pressed ? 0 : 1 border.color: control.Theme.frameColor } @@ -91,10 +91,9 @@ AbstractCheckBox { height: parent.height - control.topPadding - control.bottomPadding text: control.text - color: control.Theme.textColor + color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor elide: Text.ElideRight visible: control.text - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 0a78011e..21bc6417 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -66,9 +66,8 @@ AbstractGroupBox { width: parent.width - control.leftPadding - control.rightPadding text: control.title - color: control.Theme.textColor + color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index b8d1dbf8..6cf95a58 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -68,7 +68,7 @@ AbstractProgressBar { width: offset * (parent.width - x) - 2 height: 2 - color: control.Theme.accentColor + color: control.enabled ? control.Theme.accentColor : control.Theme.disabledColor radius: control.Theme.roundness SequentialAnimation on offset { diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 92890ed0..a73605ff 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -66,7 +66,6 @@ AbstractRadioButton { radius: width / 2 border.width: control.activeFocus ? 2 : 1 border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor - opacity: enabled ? 1.0 : control.Theme.disabledOpacity color: control.Theme.backgroundColor Rectangle { @@ -75,9 +74,10 @@ AbstractRadioButton { width: 12 height: 12 radius: width / 2 - color: Qt.tint(Qt.tint(control.checked ? control.Theme.accentColor : control.Theme.baseColor, - control.checked && control.activeFocus ? control.Theme.focusColor : "transparent"), - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.tint(control.checked && !control.enabled ? control.Theme.disabledColor : + control.checked && control.activeFocus ? control.Theme.focusColor : + control.checked ? control.Theme.accentColor : control.Theme.baseColor, + control.pressed ? control.Theme.pressColor : "transparent") border.width: control.checked || control.pressed ? 0 : 1 border.color: control.Theme.frameColor } @@ -92,10 +92,9 @@ AbstractRadioButton { height: parent.height - control.topPadding - control.bottomPadding text: control.text - color: control.Theme.textColor + color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor elide: Text.ElideRight visible: control.text - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index e8a68c5a..284a0b2f 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -71,9 +71,9 @@ AbstractSlider { height: 12 radius: width / 2 - color: Qt.tint(Qt.tint(control.Theme.accentColor, - control.activeFocus ? control.Theme.focusColor : "transparent"), - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.tint(!control.enabled ? control.Theme.disabledColor : + control.activeFocus ? control.Theme.focusColor : control.Theme.accentColor, + control.pressed ? control.Theme.pressColor : "transparent") } } @@ -97,7 +97,7 @@ AbstractSlider { width: parent.horizontal ? control.position * parent.width - 4 : 2 height: parent.horizontal ? 2 : control.position * parent.height - 4 - color: control.Theme.accentColor + color: control.enabled ? control.Theme.accentColor : control.Theme.disabledColor radius: control.Theme.roundness } } diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index ccfdaa3c..518c07ad 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -67,7 +67,6 @@ AbstractSwitch { radius: 10 border.width: control.activeFocus ? 2 : 1 border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor - opacity: enabled ? 1.0 : control.Theme.disabledOpacity color: control.Theme.backgroundColor Rectangle { @@ -75,9 +74,10 @@ AbstractSwitch { height: 12 radius: 6 - color: Qt.tint(Qt.tint(control.checked ? control.Theme.accentColor : control.Theme.baseColor, - control.checked && control.activeFocus ? control.Theme.focusColor : "transparent"), - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.tint(control.checked && !control.enabled ? control.Theme.disabledColor : + control.checked && control.activeFocus ? control.Theme.focusColor : + control.checked ? control.Theme.accentColor : control.Theme.baseColor, + control.pressed ? control.Theme.pressColor : "transparent") border.width: control.checked || control.pressed ? 0 : 1 border.color: control.Theme.frameColor @@ -101,10 +101,9 @@ AbstractSwitch { height: parent.height - control.topPadding - control.bottomPadding text: control.text - color: control.Theme.textColor + color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor elide: Text.ElideRight visible: control.text - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 881b18fe..8c658867 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -61,8 +61,7 @@ AbstractTabButton { text: control.text font.pointSize: 10 elide: Text.ElideRight - color: control.pressed ? control.Theme.accentColor : control.Theme.textColor - opacity: enabled ? 1.0 : control.Theme.disabledOpacity + color: !control.enabled ? control.Theme.disabledColor : control.pressed ? control.Theme.accentColor : control.Theme.textColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 4e1199e8..f415944c 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -46,7 +46,7 @@ AbstractTextArea { Accessible.readOnly: readOnly Accessible.description: placeholder ? placeholder.text : "" - color: Theme.textColor + color: enabled ? Theme.textColor : Theme.disabledColor selectionColor: Theme.selectionColor selectedTextColor: Theme.selectedTextColor diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 5d623b2f..6058e6aa 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -48,7 +48,7 @@ AbstractTextField { padding: Theme.padding - color: Theme.textColor + color: enabled ? Theme.textColor : Theme.disabledColor selectionColor: Theme.selectionColor selectedTextColor: Theme.selectedTextColor verticalAlignment: TextInput.AlignVCenter @@ -69,6 +69,5 @@ AbstractTextField { radius: control.Theme.roundness border.width: control.activeFocus ? 2 : 1 border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor - opacity: enabled ? 1.0 : control.Theme.disabledOpacity } } diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index fec1c889..fdf921e1 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -67,16 +67,16 @@ AbstractToggleButton { radius: control.Theme.roundness border.width: control.activeFocus ? 2 : 1 border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor - opacity: enabled ? 1.0 : control.Theme.disabledOpacity color: control.Theme.backgroundColor Rectangle { width: 12 height: 12 - color: Qt.tint(Qt.tint(control.checked ? control.Theme.accentColor : control.Theme.baseColor, - control.checked && control.activeFocus ? control.Theme.focusColor : "transparent"), - control.pressed ? control.Theme.pressColor : "transparent") + color: Qt.tint(control.checked && !control.enabled ? control.Theme.disabledColor : + control.checked && control.activeFocus ? control.Theme.focusColor : + control.checked ? control.Theme.accentColor : control.Theme.baseColor, + control.pressed ? control.Theme.pressColor : "transparent") border.width: control.checked || control.pressed ? 0 : 1 border.color: control.Theme.frameColor @@ -100,10 +100,9 @@ AbstractToggleButton { height: parent.height - control.topPadding - control.bottomPadding text: control.text - color: control.Theme.textColor + color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor elide: Text.ElideRight visible: control.text - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignLeft verticalAlignment: Text.AlignVCenter } diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index b185dc79..38327966 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -58,9 +58,8 @@ AbstractButton { height: parent.height - control.topPadding - control.bottomPadding text: control.text - color: control.Theme.textColor + color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor elide: Text.ElideRight - opacity: enabled ? 1.0 : control.Theme.disabledOpacity horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } -- cgit v1.2.3