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 | |
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>
-rw-r--r-- | src/imports/controls/TextArea.qml | 5 | ||||
-rw-r--r-- | src/imports/controls/TextField.qml | 7 | ||||
-rw-r--r-- | src/imports/controls/qquickdefaultstyle.cpp | 5 | ||||
-rw-r--r-- | src/imports/controls/qquickdefaultstyle_p.h | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index cbba5912..ed83fb7d 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -52,8 +52,7 @@ T.TextArea { padding: 6 leftPadding: padding + 4 - opacity: enabled ? 1 : 0.2 - color: Default.textColor + color: enabled ? Default.textColor : Default.textDisabledLightColor selectionColor: Default.textSelectionColor selectedTextColor: color @@ -66,7 +65,7 @@ T.TextArea { text: control.placeholderText font: control.font - color: Default.textDisabledLightColor + color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight 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") } } diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp index 38c98a72..15c59798 100644 --- a/src/imports/controls/qquickdefaultstyle.cpp +++ b/src/imports/controls/qquickdefaultstyle.cpp @@ -93,6 +93,11 @@ QColor QQuickDefaultStyle::textDisabledLightColor() const return QColor::fromRgba(0xFFC2C2C2); } +QColor QQuickDefaultStyle::textPlaceholderColor() const +{ + return QColor::fromRgba(0xFF777777); +} + QColor QQuickDefaultStyle::focusColor() const { return QColor::fromRgba(0xFF0066FF); diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h index d12587c6..fcd489a0 100644 --- a/src/imports/controls/qquickdefaultstyle_p.h +++ b/src/imports/controls/qquickdefaultstyle_p.h @@ -66,6 +66,7 @@ class QQuickDefaultStyle : public QObject Q_PROPERTY(QColor textSelectionColor READ textSelectionColor CONSTANT FINAL) Q_PROPERTY(QColor textDisabledColor READ textDisabledColor CONSTANT FINAL) Q_PROPERTY(QColor textDisabledLightColor READ textDisabledLightColor CONSTANT FINAL) + Q_PROPERTY(QColor textPlaceholderColor READ textPlaceholderColor CONSTANT FINAL) Q_PROPERTY(QColor focusColor READ focusColor CONSTANT FINAL) Q_PROPERTY(QColor focusLightColor READ focusLightColor CONSTANT FINAL) Q_PROPERTY(QColor focusPressedColor READ focusPressedColor CONSTANT FINAL) @@ -109,6 +110,7 @@ public: QColor textSelectionColor() const; QColor textDisabledColor() const; QColor textDisabledLightColor() const; + QColor textPlaceholderColor() const; QColor focusColor() const; QColor focusLightColor() const; QColor focusPressedColor() const; |