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

Merge pull request #11358 from vladest/fix_google_vr_height

Browse source 
Momentum aka flickable for WebView
This commit is contained in:
Sam Gondelman 2017-12-08 10:46:52 -08:00 committed by GitHub
commit 352c11d7c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/resources/qml/controls/FlickableWebViewCore.qml
View file

@ -21,6 +21,8 @@ Item {
signal newViewRequestedCallback(var request) signal newViewRequestedCallback(var request)
signal loadingChangedCallback(var loadRequest) signal loadingChangedCallback(var loadRequest)
width: parent.width
property bool interactive: false property bool interactive: false
StylesUIt.HifiConstants { StylesUIt.HifiConstants {
@ -58,7 +60,8 @@ Item {
WebEngineView { WebEngineView {
id: webViewCore id: webViewCore
anchors.fill: parent width: parent.width
height: parent.height
profile: HFWebEngineProfile; profile: HFWebEngineProfile;
settings.pluginsEnabled: true settings.pluginsEnabled: true
@ -91,20 +94,19 @@ Item {
userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ] userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ]
property string newUrl: ""
Component.onCompleted: { Component.onCompleted: {
webChannel.registerObject("eventBridge", eventBridge); webChannel.registerObject("eventBridge", eventBridge);
webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper); webChannel.registerObject("eventBridgeWrapper", eventBridgeWrapper);
// Ensure the JS from the web-engine makes it to our logging
webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " + message);
});
if (webViewCoreUserAgent !== undefined) { if (webViewCoreUserAgent !== undefined) {
webViewCore.profile.httpUserAgent = webViewCoreUserAgent webViewCore.profile.httpUserAgent = webViewCoreUserAgent
} else { } else {
webViewCore.profile.httpUserAgent += " (HighFidelityInterface)"; webViewCore.profile.httpUserAgent += " (HighFidelityInterface)";
} }
// Ensure the JS from the web-engine makes it to our logging
webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) {
console.log("Web Entity JS message: " + sourceID + " " + lineNumber + " " + message);
});
} }
onFeaturePermissionRequested: { onFeaturePermissionRequested: {

1
libraries/ui/src/ui/OffscreenQmlSurface.cpp
View file

@ -1149,6 +1149,7 @@ bool OffscreenQmlSurface::handlePointerEvent(const PointerEvent& event, class QT
touchEvent.setTarget(_rootItem); touchEvent.setTarget(_rootItem);
touchEvent.setTouchPoints(touchPoints); touchEvent.setTouchPoints(touchPoints);
touchEvent.setTouchPointStates(touchPointStates); touchEvent.setTouchPointStates(touchPointStates);
touchEvent.setTimestamp((ulong)QDateTime::currentMSecsSinceEpoch());
touchEvent.ignore(); touchEvent.ignore();
} }