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

Fix defocusing

Browse source
This commit is contained in:
David Rowe 2016-09-24 21:23:30 +12:00
parent 0f672c3aa2
commit 5b6835fbdb
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/controls-uit/ContentSection.qml
View file

@ -112,7 +112,7 @@ Column {
// Events are propogated so that any active control is defocussed.
anchors.fill: parent
propagateComposedEvents: true
onClicked: {
onPressed: {
toggleCollapsed();
mouse.accepted = false;
}

2
interface/resources/qml/windows/ScrollingWindow.qml
View file

@ -28,7 +28,7 @@ import "../controls" as HiFiControls
Window {
id: window
HifiConstants { id: hifi }
children: [ swallower, frame, pane, activator ]
children: [ swallower, frame, defocuser, pane, activator ]
property var footer: Item { } // Optional static footer at the bottom of the dialog.
readonly property var footerContentHeight: footer.height > 0 ? (footer.height + 2 * hifi.dimensions.contentSpacing.y + 3) : 0

21
interface/resources/qml/windows/Window.qml
View file

@ -44,7 +44,7 @@ Fadable {
implicitHeight: content ? content.height : 0
implicitWidth: content ? content.width : 0
x: desktop.invalid_position; y: desktop.invalid_position;
children: [ swallower, frame, content, activator ]
children: [ swallower, frame, defocuser, content, activator ]
//
// Custom properties
@ -122,6 +122,21 @@ Fadable {
}
}
// This mouse area defocuses the current control so that the HMD keyboard gets hidden.
property var defocuser: MouseArea {
width: frame.decoration ? frame.decoration.width : window.width
height: frame.decoration ? frame.decoration.height : window.height
x: frame.decoration ? frame.decoration.anchors.leftMargin : 0
y: frame.decoration ? frame.decoration.anchors.topMargin : 0
propagateComposedEvents: true
acceptedButtons: Qt.AllButtons
enabled: window.visible
onPressed: {
frame.forceActiveFocus();
mouse.accepted = false;
}
}
// This mouse area serves to swallow mouse events while the mouse is over the window
// to prevent things like mouse wheel events from reaching the application and changing
// the camera if the user is scrolling through a list and gets to the end.
@ -133,9 +148,7 @@ Fadable {
hoverEnabled: true
acceptedButtons: Qt.AllButtons
enabled: window.visible
onClicked: {
frame.forceActiveFocus(); // Defocus any current field so that the keyboard gets hidden.
}
onClicked: {}
onDoubleClicked: {}
onPressAndHold: {}
onReleased: {}