diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-24 23:54:19 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-25 10:36:36 +0000 |
| commit | d5408fe6c01dd9a3c5e9b943db5abda755df0b12 (patch) | |
| tree | 5ecb6caafada917fe043d223d7f3bc6a94b82d83 /src/imports | |
| parent | 8ccc9780c8ab46f69df0c75ae2b4bdc4cb6b018b (diff) | |
Fix Tumbler font, and TextField & TextArea placeholder fonts
Change-Id: Ifbc8e0a221b1190becb789d69b9b313ab45e1615
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/TextArea.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/TextField.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/Tumbler.qml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index 0ce489ff..fcbe52a7 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -52,6 +52,7 @@ T.TextArea { width: control.availableWidth height: control.availableHeight + font: control.font color: control.Theme.disabledColor visible: !control.length } diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 98baebbc..6437a1de 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -55,6 +55,7 @@ T.TextField { width: control.width - (control.leftPadding + control.rightPadding) height: control.height - (control.topPadding + control.bottomPadding) + font: control.font color: control.Theme.disabledColor visible: !control.displayText elide: Text.ElideRight diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index feacb721..36c84cdb 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -48,6 +48,7 @@ T.Tumbler { id: label text: modelData color: "#666666" + font: control.font opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter |