diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 11:09:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-26 12:37:07 +0000 |
| commit | 17a2c8bb158c099fd2dace002e30405f8e60ec06 (patch) | |
| tree | 4d353f8f53231599600c49b1eb2f933f10a8fbf0 /src | |
| parent | d34a7c61015f9dcd9ee749ea369ac62a48864c74 (diff) | |
Default: choose TextField background from the palette
Task-number: QTBUG-63369
Change-Id: I371fbcdfe0cbea9e668d82912d6d7b5ed554542b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/TextField.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaultstyle.cpp | 5 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaultstyle_p.h | 2 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 3 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index e9cfad39..4d17fc41 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -76,7 +76,7 @@ T.TextField { implicitWidth: 200 implicitHeight: 40 border.width: control.activeFocus ? 2 : 1 - color: control.enabled ? Default.backgroundColor : Default.indicatorFrameDisabledColor - border.color: control.activeFocus ? control.palette.highlight : (control.enabled ? Default.disabledLightColor : "transparent") + color: control.palette.base + border.color: control.activeFocus ? control.palette.highlight : control.palette.mid } } diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp index a1b608dc..736940dd 100644 --- a/src/imports/controls/qquickdefaultstyle.cpp +++ b/src/imports/controls/qquickdefaultstyle.cpp @@ -198,9 +198,4 @@ QColor QQuickDefaultStyle::disabledDarkColor() const return QColor::fromRgba(0xFF353637); } -QColor QQuickDefaultStyle::disabledLightColor() const -{ - return QColor::fromRgba(0xFFBDBEBF); -} - QT_END_NAMESPACE diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h index 27d7c7c7..34000420 100644 --- a/src/imports/controls/qquickdefaultstyle_p.h +++ b/src/imports/controls/qquickdefaultstyle_p.h @@ -87,7 +87,6 @@ class QQuickDefaultStyle : public QObject Q_PROPERTY(QColor scrollBarColor READ scrollBarColor CONSTANT FINAL) Q_PROPERTY(QColor scrollBarPressedColor READ scrollBarPressedColor CONSTANT FINAL) Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL) - Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL) public: explicit QQuickDefaultStyle(QObject *parent = nullptr); @@ -125,7 +124,6 @@ public: QColor scrollBarColor() const; QColor scrollBarPressedColor() const; QColor disabledDarkColor() const; - QColor disabledLightColor() const; }; QT_END_NAMESPACE diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index 6caf651a..3e385707 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -41,6 +41,9 @@ QT_BEGIN_NAMESPACE QQuickDefaultTheme::QQuickDefaultTheme() : QQuickTheme(QStringLiteral("Default")) { + systemPalette.setColor(QPalette::Base, QColor::fromRgba(0xFFFFFFFF)); + systemPalette.setColor(QPalette::Disabled, QPalette::Base, QColor::fromRgba(0xFFD6D6D6)); + systemPalette.setColor(QPalette::ButtonText, QColor::fromRgba(0xFF26282A)); systemPalette.setColor(QPalette::Disabled, QPalette::ButtonText, QColor::fromRgba(0x4D26282A)); |