summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprofiler/qml/MainView.qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2013-11-14 13:06:44 +0100
committerUlf Hermann <ulf.hermann@digia.com>2013-11-14 17:20:08 +0100
commit188f5de5ed969534ab8be30d671204fc896ddf0a (patch)
treebf76c639abb96a91c811340de5150ea0ea9495d8 /src/plugins/qmlprofiler/qml/MainView.qml
parent87ea12a6dbb163a0aff3029056966e288f355418 (diff)
downloadqt-creator-188f5de5ed969534ab8be30d671204fc896ddf0a.tar.gz
QmlProfiler: Provide a vertical scroll bar for the timeline view.
The timeline can be vertically navigated by flicking, which is not very appropriate for desktop applications. This change provides a scroll bar and mouse wheel scrolling in addition to that. Also it makes the vertical movement stop at the boundaries. The mouse wheel would exhibit unintuitive behavior without it. Change-Id: I5ef126525e452f46aa0a483a544345b8f618d829 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/qmlprofiler/qml/MainView.qml')
-rw-r--r--src/plugins/qmlprofiler/qml/MainView.qml10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml
index 01df8a5b4d..a87cf6640c 100644
--- a/src/plugins/qmlprofiler/qml/MainView.qml
+++ b/src/plugins/qmlprofiler/qml/MainView.qml
@@ -307,6 +307,11 @@ Rectangle {
height: root.height
clip: true
contentHeight: labels.height
+ boundsBehavior: Flickable.StopAtBounds
+
+ // ScrollView will try to deinteractivate it. We don't want that
+ // as the horizontal flickable is interactive, too.
+ onInteractiveChanged: interactive = true
// ***** child items
TimeMarks {
@@ -501,6 +506,11 @@ Rectangle {
}
}
+ ScrollView {
+ contentItem: vertflick
+ anchors.fill: parent
+ }
+
SelectionRangeDetails {
id: selectionRangeDetails
visible: root.selectionRangeMode