git.iko.soy/unity8
on xenial help sign in
Move OSKController to end of shell files, so that input is grabbed appropriately
7ada6f1Michael Terry
qml/Components/BasicShell.qml−5
compare with xenial
unifiedsplit
@@ -81,9 +81,4 @@ FocusScope {
81 property: "domain"
81 property: "domain"
82 value: "unity8"
82 value: "unity8"
83 }
83 }
84−
85− OSKController {
86− anchors.topMargin: panel.panelHeight
87− anchors.fill: parent // as needs to know the geometry of the shell
88− }
89}
84}
qml/GreeterShell.qml+5
@@ -235,6 +235,11 @@ BasicShell {
235 }
235 }
236 }
236 }
237
237
238+ OSKController {
239+ anchors.topMargin: panel.panelHeight
240+ anchors.fill: parent // as needs to know the geometry of the shell
241+ }
242+
238 Connections {
243 Connections {
239 id: powerConnection
244 id: powerConnection
240 target: Powerd
245 target: Powerd
qml/Shell.qml+5
@@ -575,6 +575,11 @@ BasicShell {
575 blockInput: true
575 blockInput: true
576 }
576 }
577
577
578+ OSKController {
579+ anchors.topMargin: panel.panelHeight
580+ anchors.fill: parent // as needs to know the geometry of the shell
581+ }
582+
578 //FIXME: This should be handled in the input stack, keyboard shouldnt propagate
583 //FIXME: This should be handled in the input stack, keyboard shouldnt propagate
579 MouseArea {
584 MouseArea {
580 anchors.bottom: parent.bottom
585 anchors.bottom: parent.bottom