Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 09:44:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links

Browse source
This commit is contained in:
Dante Ruiz 2017-05-01 21:58:09 +01:00
commit 62870d85d3
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,6 +90,13 @@ Item {
horizontalCenter: parent.horizontalCenter;
}
}
MouseArea {
anchors.fill: parent
preventStealing: true
propagateComposedEvents: true
}
}
ListModel {

8
interface/resources/qml/hifi/tablet/TabletRoot.qml
View file

@ -92,16 +92,16 @@ Item {
}
function loadWebBase() {
loader.source = "";
loader.source = "TabletWebView.qml";
loader.source = "";
loader.source = "TabletWebView.qml";
}
function returnToPreviousApp() {
tabletApps.remove(currentApp);
var isWebPage = tabletApps.get(currentApp).isWebUrl;
if (isWebPage) {
var webUrl = tabletApps.get(currentApp).appWebUrl;
var scriptUrl = tabletApps.get(currentApp).scriptUrl;
var webUrl = tabletApps.get(currentApp).appWebUrl;
var scriptUrl = tabletApps.get(currentApp).scriptUrl;
loadSource("TabletWebView.qml");
loadWebUrl(webUrl, scriptUrl);
} else {

4
interface/resources/qml/hifi/tablet/WindowRoot.qml
View file

@ -39,8 +39,8 @@ Windows.ScrollingWindow {
}
function loadWebBase() {
loader.source = "";
loader.source = "WindowWebView.qml";
loader.source = "";
loader.source = "WindowWebView.qml";
}
function loadWebUrl(url, injectedJavaScriptUrl) {