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

Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix

Browse source 
Only dismiss letterbox when clicking on grey areas
This commit is contained in:
Howard Stearns 2018-04-19 11:47:10 -07:00 committed by GitHub
commit 6d151f022d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
interface/resources/qml/hifi/LetterboxMessage.qml
View file

@ -30,6 +30,16 @@ Item {
color: "black" color: "black"
opacity: 0.5 opacity: 0.5
radius: popupRadius radius: popupRadius
MouseArea {
anchors.fill: parent;
hoverEnabled: true;
acceptedButtons: Qt.LeftButton;
propagateComposedEvents: false;
onClicked: {
letterbox.visible = false;
}
}
} }
Rectangle { Rectangle {
id: textContainer; id: textContainer;
@ -38,6 +48,14 @@ Item {
anchors.centerIn: parent anchors.centerIn: parent
radius: popupRadius radius: popupRadius
color: "white" color: "white"
// Prevent dismissing the popup by clicking on the textContainer
MouseArea {
anchors.fill: parent;
hoverEnabled: true;
propagateComposedEvents: false;
}
Item { Item {
id: contentContainer id: contentContainer
width: parent.width - 50 width: parent.width - 50
@ -135,11 +153,4 @@ Item {
} }
} }
} }
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
onClicked: {
letterbox.visible = false;
}
}
} }