summaryrefslogtreecommitdiffstats
path: root/demos/declarative/webbrowser
diff options
context:
space:
mode:
Diffstat (limited to 'demos/declarative/webbrowser')
-rw-r--r--demos/declarative/webbrowser/content/ScrollBar.qml2
-rw-r--r--demos/declarative/webbrowser/webbrowser.qml14
2 files changed, 6 insertions, 10 deletions
diff --git a/demos/declarative/webbrowser/content/ScrollBar.qml b/demos/declarative/webbrowser/content/ScrollBar.qml
index 976297b..aa79d35 100644
--- a/demos/declarative/webbrowser/content/ScrollBar.qml
+++ b/demos/declarative/webbrowser/content/ScrollBar.qml
@@ -55,7 +55,7 @@ Item {
states: State {
name: "visible"
- when: scrollArea.moving
+ when: container.orientation == Qt.Vertical ? scrollArea.movingVertically : scrollArea.movingHorizontally
PropertyChanges { target: container; opacity: 1.0 }
}
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 27da814..f539e21 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -15,13 +15,9 @@ Rectangle {
id: webView
url: webBrowser.urlString
anchors { top: headerSpace.bottom; left: parent.left; right: parent.right; bottom: parent.bottom }
-
}
- Item {
- id: headerSpace
- width: parent.width; height: 62
- }
+ Item { id: headerSpace; width: parent.width; height: 62 }
Header {
id: header
@@ -34,8 +30,8 @@ Rectangle {
anchors { right: parent.right; top: header.bottom; bottom: parent.bottom }
}
-// ScrollBar {
-// scrollArea: webView; height: 8; orientation: Qt.Horizontal
-// anchors { right: parent.right; rightMargin: 8; left: parent.left; bottom: parent.bottom }
-// }
+ ScrollBar {
+ scrollArea: webView; height: 8; orientation: Qt.Horizontal
+ anchors { right: parent.right; rightMargin: 8; left: parent.left; bottom: parent.bottom }
+ }
}