Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 08:17:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix MS15545: Fix PAL/GoTo WebView's Back Button

Browse source
This commit is contained in:
Zach Fox 2018-06-18 10:19:00 -07:00
parent 2655dd77b6
commit f307f1d97a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/controls/TabletWebView.qml
View file

@ -11,7 +11,6 @@ Item {
height: parent !== null ? parent.height : undefined height: parent !== null ? parent.height : undefined
property var parentStackItem: null property var parentStackItem: null
property int headerHeight: 70 property int headerHeight: 70
property string url
property string scriptURL property string scriptURL
property bool keyboardEnabled: false property bool keyboardEnabled: false
property bool keyboardRaised: false property bool keyboardRaised: false
@ -23,6 +22,7 @@ Item {
property bool punctuationMode: false property bool punctuationMode: false
property bool passwordField: false property bool passwordField: false
property bool isDesktop: false property bool isDesktop: false
property alias url: web.url
property alias webView: web.webViewCore property alias webView: web.webViewCore
property alias profile: web.webViewCoreProfile property alias profile: web.webViewCoreProfile
property bool remove: false property bool remove: false
@ -81,7 +81,7 @@ Item {
color: hifi.colors.baseGray color: hifi.colors.baseGray
font.pixelSize: 12 font.pixelSize: 12
verticalAlignment: Text.AlignLeft verticalAlignment: Text.AlignLeft
text: root.url text: web.url
anchors { anchors {
top: nav.bottom top: nav.bottom
horizontalCenter: parent.horizontalCenter; horizontalCenter: parent.horizontalCenter;
@ -131,11 +131,11 @@ Item {
function loadUrl(url) { function loadUrl(url) {
web.webViewCore.url = url web.webViewCore.url = url
root.url = web.webViewCore.url;
} }
onUrlChanged: { Rectangle {
loadUrl(url); anchors.fill: web;
color: hifi.colors.white;
} }
FlickableWebViewCore { FlickableWebViewCore {