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

PAL: Prevent opening of Availability from WebView

Browse source
This commit is contained in:
Zach Fox 2018-02-13 13:21:40 -08:00
parent 915870018a
commit 8cd00c49d6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/resources/qml/hifi/Pal.qml
View file

@ -48,7 +48,7 @@ Rectangle {
// The letterbox used for popup messages // The letterbox used for popup messages
LetterboxMessage { LetterboxMessage {
id: letterboxMessage; id: letterboxMessage;
z: 999; // Force the popup on top of everything else z: 998; // Force the popup on top of everything else
} }
Connections { Connections {
target: GlobalServices target: GlobalServices
@ -60,7 +60,7 @@ Rectangle {
// The ComboDialog used for setting availability // The ComboDialog used for setting availability
ComboDialog { ComboDialog {
id: comboDialog; id: comboDialog;
z: 999; // Force the ComboDialog on top of everything else z: 998; // Force the ComboDialog on top of everything else
dialogWidth: parent.width - 50; dialogWidth: parent.width - 50;
dialogHeight: parent.height - 100; dialogHeight: parent.height - 100;
} }
@ -1013,7 +1013,7 @@ Rectangle {
} }
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
enabled: myData.userName !== "Unknown user"; enabled: myData.userName !== "Unknown user" && !userInfoViewer.visible;
hoverEnabled: true; hoverEnabled: true;
onClicked: { onClicked: {
popupComboDialog("Set your availability:", popupComboDialog("Set your availability:",
@ -1044,6 +1044,7 @@ Rectangle {
HifiControls.TabletWebView { HifiControls.TabletWebView {
id: userInfoViewer; id: userInfoViewer;
z: 999;
anchors { anchors {
top: parent.top; top: parent.top;
bottom: parent.bottom; bottom: parent.bottom;