git.iko.soy/unity8
on xenial help sign in
Fix some OSK/focus issues with NarrowMode
bc1218aMichael Terry
qml/Components/PassphraseLockscreen.qml+5
compare with xenial
unifiedsplit
@@ -98,6 +98,11 @@ Item {
98 // has oddly sized password characters that don't scale right)
98 // has oddly sized password characters that don't scale right)
99 opacity: 0
99 opacity: 0
100
100
101+ onFocusChanged: {
102+ // Within our FocusScope, we always want to have focus
103+ focus = true;
104+ }
105+
101 // simulate being disabled, but without removing OSK focus
106 // simulate being disabled, but without removing OSK focus
102 maximumLength: root.entryEnabled ? 32767 : length
107 maximumLength: root.entryEnabled ? 32767 : length
103
108
qml/Greeter/NarrowView.qml+2−1
@@ -18,7 +18,7 @@ import QtQuick 2.3
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19import "../Components"
19import "../Components"
20
20
21−Item {
21+FocusScope {
22 id: root
22 id: root
23
23
24 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
24 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
@@ -106,6 +106,7 @@ Item {
106 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
106 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
107 anchors.fill: parent
107 anchors.fill: parent
108 visible: required
108 visible: required
109+ enabled: !coverPage.shown
109 background: root.background
110 background: root.background
110 darkenBackground: 0.4
111 darkenBackground: 0.4
111 alphaNumeric: root.alphanumeric
112 alphaNumeric: root.alphanumeric
qml/Greeter/WideView.qml+1−1
@@ -17,7 +17,7 @@
17import QtQuick 2.3
17import QtQuick 2.3
18import Ubuntu.Components 1.1
18import Ubuntu.Components 1.1
19
19
20−Item {
20+FocusScope {
21 id: root
21 id: root
22
22
23 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
23 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin