Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-07 19:12:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cr round 2

Browse source
This commit is contained in:
milad 2019-07-25 13:11:11 -07:00
parent 2f4566b63c
commit 5083e449b0
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/+webengine/TabletBrowser.qml
View file

@ -87,6 +87,10 @@ Item {
}
onFeaturePermissionRequested: {
if (permissionPopupBackground.visible === true) {
console.log("Browser engine requested a new permission, but user is already being presented with a different permission request. Aborting request for new permission...");
return;
}
permissionPopupBackground.securityOrigin = securityOrigin;
permissionPopupBackground.feature = feature;

5
interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml
View file

@ -146,6 +146,11 @@ Item {
}
onFeaturePermissionRequested: {
if (permissionPopupBackground.visible === true) {
console.log("Browser engine requested a new permission, but user is already being presented with a different permission request. Aborting request for new permission...");
return;
}
permissionPopupBackground.securityOrigin = securityOrigin;
permissionPopupBackground.feature = feature;

4
interface/resources/qml/controlsUit/+webengine/BaseWebView.qml
View file

@ -41,6 +41,10 @@ WebEngineView {
WebSpinner { }
onFeaturePermissionRequested: {
if (permissionPopupBackground.visible === true) {
console.log("Browser engine requested a new permission, but user is already being presented with a different permission request. Aborting request for new permission...");
return;
}
permissionPopupBackground.securityOrigin = securityOrigin;
permissionPopupBackground.feature = feature;

17
interface/resources/qml/controlsUit/PermissionPopup.qml
View file

@ -26,13 +26,10 @@ Rectangle {
ColumnLayout {
anchors.fill: parent
Rectangle {
id: webAccessHeaderContainer
height: 75
anchors.top: parent.top
Layout.preferredWidth: parent.width
HifiStyles.RalewayBold {
id: webAccessHeaderText
text: "REQUEST FOR DEVICE ACCESS"
anchors.horizontalCenter: parent.horizontalCenter
@ -44,12 +41,10 @@ Rectangle {
}
Rectangle {
id: webAccessInfoContainer
height: 35
Layout.preferredWidth: parent.width
HifiStyles.RalewayLight {
id: webAccessInfoText
text: "This website is attempting to " + root.permissionLanguage[root.currentRequestedPermission] + "."
anchors.centerIn: parent
@ -60,39 +55,33 @@ Rectangle {
}
Rectangle {
id: permissionsButtonsRow
height: 100
Layout.preferredWidth: parent.width
Layout.topMargin: 35
property int space: 8
readonly property int _LEFT_BUTTON: 0
readonly property int _RIGHT_BUTTON: 1
HifiControls.Button {
id: leftButton
text: "Don't Allow"
anchors.right: parent.horizontalCenter
anchors.rightMargin: parent.space
width: 125
color: hifi.buttons.red
enabled: true
height: 38
onClicked: {
root.permissionButtonPressed(parent._LEFT_BUTTON);
root.permissionButtonPressed(0);
}
}
HifiControls.Button {
id: rightButton
text: "Yes allow access"
anchors.left: parent.horizontalCenter
anchors.leftMargin: parent.space
color: hifi.buttons.blue
enabled: true
width: 155
height: 38
onClicked: {
root.permissionButtonPressed(parent._RIGHT_BUTTON);
root.permissionButtonPressed(1);
}
}
}