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

open webview from tabletwebscreen

Browse source
This commit is contained in:
druiz17 2017-04-30 15:27:34 -07:00
parent b1abbbe472
commit 2bf7b12c7d
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -270,13 +270,8 @@ Item {
} }
onNewViewRequested: { onNewViewRequested: {
console.log("--------------> new window opened <-------------");
request.openIn(webview); request.openIn(webview);
} }
onWindowCloseRequested: {
console.log("-------------> requested to cloes window <---------------");
}
} }
HiFiControls.Keyboard { HiFiControls.Keyboard {

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

@ -24,7 +24,6 @@ Item {
option = value; option = value;
} }
Component { id: profileCreator; HFTabletWebEngineProfile {} }
Component { id: inputDialogBuilder; TabletQueryDialog { } } Component { id: inputDialogBuilder; TabletQueryDialog { } }
function inputDialog(properties) { function inputDialog(properties) {
openModal = inputDialogBuilder.createObject(tabletRoot, properties); openModal = inputDialogBuilder.createObject(tabletRoot, properties);
@ -91,6 +90,11 @@ Item {
loader.item.gotoPreviousApp = true; loader.item.gotoPreviousApp = true;
} }
} }
function loadWebBase() {
loader.source = "";
loader.source = "TabletWebView.qml";
}
function returnToPreviousApp() { function returnToPreviousApp() {
tabletApps.remove(currentApp); tabletApps.remove(currentApp);
@ -117,8 +121,6 @@ Item {
function loadWebUrl(url, injectedJavaScriptUrl) { function loadWebUrl(url, injectedJavaScriptUrl) {
tabletApps.clear(); tabletApps.clear();
var newProfile = profileCreator.createObject();
loader.item.viewProfile = newProfile;
loader.item.url = url; loader.item.url = url;
loader.item.scriptURL = injectedJavaScriptUrl; loader.item.scriptURL = injectedJavaScriptUrl;
tabletApps.append({"appUrl": "TabletWebView.qml", "isWebUrl": true, "scriptUrl": injectedJavaScriptUrl, "appWebUrl": url}); tabletApps.append({"appUrl": "TabletWebView.qml", "isWebUrl": true, "scriptUrl": injectedJavaScriptUrl, "appWebUrl": url});

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

@ -38,6 +38,11 @@ Windows.ScrollingWindow {
loader.source = url; loader.source = url;
} }
function loadWebBase() {
loader.source = "";
loader.source = "WindowWebView.qml";
}
function loadWebUrl(url, injectedJavaScriptUrl) { function loadWebUrl(url, injectedJavaScriptUrl) {
loader.item.url = url; loader.item.url = url;
loader.item.scriptURL = injectedJavaScriptUrl; loader.item.scriptURL = injectedJavaScriptUrl;

2
libraries/script-engine/src/TabletScriptingInterface.cpp
View file

@ -508,7 +508,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS
if (root) { if (root) {
removeButtonsFromHomeScreen(); removeButtonsFromHomeScreen();
QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL))); QMetaObject::invokeMethod(root, "loadWebBase");
QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true))); QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl))); QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));
} }