diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-04-24 13:53:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-24 14:00:19 +0200 |
| commit | c976d9a19c3af9c51edec30cdb4b1466d39bb70a (patch) | |
| tree | a86642ff01d6fc4bfbc8e5306cf774c9220af827 /src/controls/TextArea.qml | |
| parent | 959e20309bef083f02c53a28bd90cbd1405abe30 (diff) | |
| download | qtquickcontrols-c976d9a19c3af9c51edec30cdb4b1466d39bb70a.tar.gz | |
Move ScrollBarStyle inside ScrollViewStyle
Change-Id: I22403a7deac19b614f08475a2b29696a5698811f
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/TextArea.qml')
| -rw-r--r-- | src/controls/TextArea.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 0cae59c8..d28f6556 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -390,7 +390,7 @@ ScrollView { if (length) string = "\n" + string text += string - verticalScrollBar.value = verticalScrollBar.maximumValue + __verticalScrollBar.value = __verticalScrollBar.maximumValue } /*! @@ -651,10 +651,10 @@ ScrollView { if (!recursionGuard) { recursionGuard = true if (wrapMode == TextEdit.NoWrap) { - horizontalScrollBar.visible = edit.paintedWidth + (2 * documentMargins) > area.viewport.width + __horizontalScrollBar.visible = edit.paintedWidth + (2 * documentMargins) > area.viewport.width edit.width = edit.paintedWidth + (2 * documentMargins) } else { - horizontalScrollBar.visible = false + __horizontalScrollBar.visible = false edit.width = area.viewport.width - (2 * documentMargins) } edit.height = Math.max(area.viewport.height - (2 * documentMargins), paintedHeight + (2 * documentMargins)) @@ -711,9 +711,9 @@ ScrollView { Keys.onPressed: { if (event.key == Qt.Key_PageUp) { - verticalScrollBar.value -= area.height + __verticalScrollBar.value -= area.height } else if (event.key == Qt.Key_PageDown) - verticalScrollBar.value += area.height + __verticalScrollBar.value += area.height } } |