diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-27 14:08:27 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 12:11:46 +0000 |
| commit | 97e25d198d6bcd219c0076947163333897c192f2 (patch) | |
| tree | 187853a462db005a751e838107d0367dc38eaf09 | |
| parent | 822e0ccab29651d9eaa8490fe236869557aa32c6 (diff) | |
Default: palette-based placeholder text color for editors
A half-translucent placeholder text color is also used in widgets.
Tweak the default disabled text color a little bit to make placeholder
text visible in disabled state, so that we can use the same approach
that has been proven to work. ;)
Task-number: QTBUG-63369
Change-Id: I9a3f0bf18fdfa4a25ef169b8fd9571c9c899ab26
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/TextArea.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/TextField.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 1701b9fe..9021d558 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -65,7 +65,8 @@ T.TextArea { text: control.placeholderText font: control.font - color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor + opacity: 0.5 + color: control.palette.text 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 4d17fc41..52125501 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -66,7 +66,8 @@ T.TextField { text: control.placeholderText font: control.font - color: enabled ? Default.textPlaceholderColor : Default.textDisabledColor + opacity: 0.5 + color: control.palette.text verticalAlignment: control.verticalAlignment visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter) elide: Text.ElideRight diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index a547b7ce..f4b6f5d7 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -68,7 +68,7 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::Midlight, QColor::fromRgba(0xFFE4E4E4)); systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); - systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0x4D353637)); + systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0x7F353637)); systemPalette.setColor(QPalette::Shadow, QColor::fromRgba(0xFF28282A)); |