diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-18 21:28:33 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-23 09:14:24 +0200 |
commit | 266fab2a8920dc79e52555b81cf1708233c1b60f (patch) | |
tree | 4829c6903c95f7582abdfbb1265cf50c98381e35 /src/controls/Styles/Base/TextAreaStyle.qml | |
parent | 9578edd239f4f1e33d2bf5c044b1bf80ab2c595d (diff) | |
download | qtquickcontrols-266fab2a8920dc79e52555b81cf1708233c1b60f.tar.gz |
Singleton SystemPalette
Each SystemPalette instance installs an event filter on the
application object. Avoid this by sharing a single SystemPalette
instance.
Change-Id: Ica9f8979b33e511c1238add3d689f380d0daa93c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/controls/Styles/Base/TextAreaStyle.qml')
-rw-r--r-- | src/controls/Styles/Base/TextAreaStyle.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/Styles/Base/TextAreaStyle.qml b/src/controls/Styles/Base/TextAreaStyle.qml index 7ad5686f..774f5cc6 100644 --- a/src/controls/Styles/Base/TextAreaStyle.qml +++ b/src/controls/Styles/Base/TextAreaStyle.qml @@ -71,16 +71,16 @@ ScrollViewStyle { property font font /*! The text color. */ - property color textColor: __syspal.text + property color textColor: SystemPaletteSingleton.text(control.enabled) /*! The text highlight color, used behind selections. */ - property color selectionColor: __syspal.highlight + property color selectionColor: SystemPaletteSingleton.highlight(control.enabled) /*! The highlighted text color, used in selections. */ - property color selectedTextColor: __syspal.highlightedText + property color selectedTextColor: SystemPaletteSingleton.highlightedText(control.enabled) /*! The background color. */ - property color backgroundColor: control.backgroundVisible ? __syspal.base : "transparent" + property color backgroundColor: control.backgroundVisible ? SystemPaletteSingleton.base(control.enabled) : "transparent" /*! \qmlproperty enumeration renderType |