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

Fix mute unmute. Scrolling thru suggestions popup now set popup's contains into url. Fixed reload timer

Browse source
This commit is contained in:
vladest 2017-10-29 14:05:47 +01:00
parent 865c241a13
commit 950ac3540a
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
interface/resources/qml/hifi/WebBrowser.qml
View file

@ -85,6 +85,7 @@ Rectangle {
addressBar.model = [] addressBar.model = []
webStack.currentItem.webEngineView.url = url webStack.currentItem.webEngineView.url = url
addressBar.editText = webStack.currentItem.webEngineView.url
suggestionRequestTimer.stop(); suggestionRequestTimer.stop();
addressBar.popup.close(); addressBar.popup.close();
} }
@ -136,6 +137,12 @@ Rectangle {
goTo(textAt(index)); goTo(textAt(index));
} }
onHighlightedIndexChanged: {
if (highlightedIndex >= 0) {
addressBar.editText = textAt(highlightedIndex)
}
}
popup.height: webStack.height popup.height: webStack.height
onFocusChanged: { onFocusChanged: {
@ -191,7 +198,7 @@ Rectangle {
if (webStack.currentItem.webEngineView.loading) { if (webStack.currentItem.webEngineView.loading) {
webStack.currentItem.webEngineView.stop(); webStack.currentItem.webEngineView.stop();
} else { } else {
webStack.currentItem.webEngineView.reloadTimer.start(); webStack.currentItem.reloadTimer.start();
} }
} }
} }
@ -228,7 +235,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
width: hifi.dimensions.controlLineHeight width: hifi.dimensions.controlLineHeight
onClicked: { onClicked: {
webStack.currentItem.webEngineView.triggerWebAction(WebEngineView.ToggleMediaMute); webStack.currentItem.webEngineView.audioMuted = !webStack.currentItem.webEngineView.audioMuted
} }
} }
} }
@ -261,6 +268,8 @@ Rectangle {
id: webViewComponent id: webViewComponent
Rectangle { Rectangle {
property alias webEngineView: webEngineView property alias webEngineView: webEngineView
property alias reloadTimer: reloadTimer
property WebEngineNewViewRequest request: null property WebEngineNewViewRequest request: null
property bool isDialog: QQControls.StackView.index > 0 property bool isDialog: QQControls.StackView.index > 0
@ -314,7 +323,7 @@ Rectangle {
WebEngineScript { WebEngineScript {
id: createGlobalEventBridge id: createGlobalEventBridge
sourceCode: eventBridgeJavaScriptToInject sourceCode: eventBridgeJavaScriptToInject
injectionPoint: WebEngineScript.DocumentCreation injectionPoint: WebEngineScript.Deferred
worldId: WebEngineScript.MainWorld worldId: WebEngineScript.MainWorld
} }
@ -399,14 +408,13 @@ Rectangle {
onWindowCloseRequested: { onWindowCloseRequested: {
webStack.pop(); webStack.pop();
} }
}
Timer { Timer {
id: reloadTimer id: reloadTimer
interval: 0 interval: 0
running: false running: false
repeat: false repeat: false
onTriggered: webEngineView.reload() onTriggered: webEngineView.reload()
}
} }
} }
} }