diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-09-19 10:32:18 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-09-19 09:16:57 +0000 |
| commit | 391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e78 (patch) | |
| tree | eae7a3b6d15163f04702343da8264e418252ebf0 /src/imports/controls/TextField.qml | |
| parent | d3aef722da533c3b100ba653498c79986a44c9f9 (diff) | |
Default: improve TextField and TextArea styling
- Remove top-level opacity assignments to allow full customization
- Add more distinction between disable and placeholder text
- Make disabled text more visible
Task-number: QTBUG-62854
Change-Id: I2e8998fb739e4beda58978173173ca94a3759caf
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/TextField.qml')
| -rw-r--r-- | src/imports/controls/TextField.qml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 980ff172..31336029 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -52,8 +52,7 @@ T.TextField { padding: 6 leftPadding: padding + 4 - opacity: enabled ? 1 : 0.2 - color: Default.textColor + color: enabled ? Default.textColor : Default.textDisabledColor selectionColor: Default.textSelectionColor selectedTextColor: color verticalAlignment: TextInput.AlignVCenter @@ -67,7 +66,7 @@ T.TextField { text: control.placeholderText font: control.font - color: Default.textDisabledColor + color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight @@ -77,7 +76,7 @@ T.TextField { implicitWidth: 200 implicitHeight: 40 border.width: control.activeFocus ? 2 : 1 - color: control.enabled ? Default.backgroundColor : Default.disabledDarkColor + color: control.enabled ? Default.backgroundColor : Default.indicatorFrameDisabledColor border.color: control.activeFocus ? Default.focusColor : (control.enabled ? Default.disabledLightColor : "transparent") } } |