diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 18:16:13 +0200 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-04-08 19:18:02 +0300 |
| commit | 7b971c28e6098b629b8e9e3e38a9465a3f1bd459 (patch) | |
| tree | c5c475894671c0cc7e38d59287d3c2d6ba46128b /src/imports/controls/TextField.qml | |
| parent | 1c0edf002a50a765a66349d733cf170f4a4024ef (diff) | |
Rename Style to Theme
Change-Id: I0186cd36f0b42ca015b70a09af27f8a3517d4a60
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/TextField.qml')
| -rw-r--r-- | src/imports/controls/TextField.qml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index a8e13f57..5d623b2f 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -46,11 +46,11 @@ AbstractTextField { Accessible.description: placeholder ? placeholder.text : "" Accessible.passwordEdit: echoMode === TextInput.Password || echoMode === TextInput.PasswordEchoOnEdit - padding: Style.padding + padding: Theme.padding - color: Style.textColor - selectionColor: Style.selectionColor - selectedTextColor: Style.selectedTextColor + color: Theme.textColor + selectionColor: Theme.selectionColor + selectedTextColor: Theme.selectedTextColor verticalAlignment: TextInput.AlignVCenter placeholder: Text { @@ -59,16 +59,16 @@ AbstractTextField { width: parent.width - control.leftPadding - control.rightPadding height: parent.height - control.topPadding - control.bottomPadding - color: control.Style.textColor - opacity: control.Style.disabledOpacity + color: control.Theme.textColor + opacity: control.Theme.disabledOpacity visible: !control.displayText } background: Rectangle { implicitWidth: 120 // TODO - radius: control.Style.roundness + radius: control.Theme.roundness border.width: control.activeFocus ? 2 : 1 - border.color: control.activeFocus ? control.Style.focusColor : control.Style.frameColor - opacity: enabled ? 1.0 : control.Style.disabledOpacity + border.color: control.activeFocus ? control.Theme.focusColor : control.Theme.frameColor + opacity: enabled ? 1.0 : control.Theme.disabledOpacity } } |