summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Nevala <samuel.nevala@intopalo.com>2015-10-26 14:30:48 +0200
committerSamuel Nevala <samuel.nevala@intopalo.com>2015-11-09 06:21:50 +0000
commit40c1f009a3487ab96748826a142d04f8ec281ef1 (patch)
treef7ca2203f427f63a74d7bfd8937d225a69e0f0d9
parent521d6fd0536b72565ca5a2ae9d9cd1514bb0e4e1 (diff)
Don't show progress indicators on Windows runtime.
Windows Runtime webview reports only indeterminate loading pregress. Change-Id: Ia007e462f68671039ea4708784bbebe9f1142679 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
-rw-r--r--examples/webview/minibrowser/main.qml8
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/webview/minibrowser/main.qml b/examples/webview/minibrowser/main.qml
index fe66a4e..3bb834a 100644
--- a/examples/webview/minibrowser/main.qml
+++ b/examples/webview/minibrowser/main.qml
@@ -46,6 +46,10 @@ import QtQuick.Controls.Styles 1.2
ApplicationWindow {
+ property bool showProgress: webView.loading
+ && Qt.platform.os !== "ios"
+ && Qt.platform.os !== "winphone"
+ && Qt.platform.os !== "winrt"
visible: true
x: initialX
y: initialY
@@ -108,7 +112,7 @@ ApplicationWindow {
anchors.centerIn: parent
style: LoadProgressStyle { }
z: Qt.platform.os === "android" ? -1 : 1
- visible: webView.loading && Qt.platform.os !== "ios"
+ visible: showProgress
minimumValue: 0
maximumValue: 100
value: webView.loadProgress > 100 ? 0 : webView.loadProgress
@@ -137,7 +141,7 @@ ApplicationWindow {
statusBar: StatusBar {
id: statusBar
- visible: webView.loading && Qt.platform.os !== "ios"
+ visible: showProgress
RowLayout {
anchors.fill: parent
Label { text: webView.loadProgress == 100 ? qsTr("Done") : qsTr("Loading: ") + webView.loadProgress + "%" }