diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-24 16:13:43 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-24 16:47:03 +0200 |
| commit | 6e023d0fb2a63b970368f88c6f3d0fd94c2c727c (patch) | |
| tree | db8102afcd155f546352b136eec41b741258598c /src/controls/TextArea.qml | |
| parent | 63c9d9f9b3a7fea5ed4c125bcbfa794bf16d24be (diff) | |
| download | qtquickcontrols-6e023d0fb2a63b970368f88c6f3d0fd94c2c727c.tar.gz | |
TextArea: let style specify the default text margin
The hard coded 4px margin is unsuitable especially on High DPI
devices. For example on Nexus 5 it should be 36px, so let the
Android style specify a suitable value.
Change-Id: I31287d2e78ae822b8bd63ea19674c85b08975426
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/controls/TextArea.qml')
| -rw-r--r-- | src/controls/TextArea.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 356b31ab..9c68701c 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -755,7 +755,7 @@ ScrollView { selectionColor: __style ? __style.selectionColor : "darkred" selectedTextColor: __style ? __style.selectedTextColor : "white" wrapMode: TextEdit.WordWrap - textMargin: 4 + textMargin: __style && __style.textMargin !== undefined ? __style.textMargin : 4 selectByMouse: area.selectByMouse && (!cursorHandle.delegate || !selectionHandle.delegate) readOnly: false |