git.iko.soy/unity8
on xenial help sign in
Fix some OSK/focus issues with NarrowMode
commitbc1218a22f121684776bf4451f9386fe5a58be66 authorMichael Terry <michael.terry@canonical.com> dateMon 2 Feb 2015, 17:14 (12 years ago) parent8669512
3 files changed+8−2
compare with xenial
unifiedsplit
qml/Components/PassphraseLockscreen.qml+5 qml/Greeter/NarrowView.qml+2−1 qml/Greeter/WideView.qml+1−1
qml/Components/PassphraseLockscreen.qml+5
@@ -98,6 +98,11 @@ Item {
9898 // has oddly sized password characters that don't scale right)
9999 opacity: 0
100100
101+ onFocusChanged: {
102+ // Within our FocusScope, we always want to have focus
103+ focus = true;
104+ }
105+
101106 // simulate being disabled, but without removing OSK focus
102107 maximumLength: root.entryEnabled ? 32767 : length
103108
qml/Greeter/NarrowView.qml+2−1
@@ -18,7 +18,7 @@ import QtQuick 2.3
1818import Ubuntu.Components 1.1
1919import "../Components"
2020
21−Item {
21+FocusScope {
2222 id: root
2323
2424 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
@@ -106,6 +106,7 @@ Item {
106106 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
107107 anchors.fill: parent
108108 visible: required
109+ enabled: !coverPage.shown
109110 background: root.background
110111 darkenBackground: 0.4
111112 alphaNumeric: root.alphanumeric
qml/Greeter/WideView.qml+1−1
@@ -17,7 +17,7 @@
1717import QtQuick 2.3
1818import Ubuntu.Components 1.1
1919
20−Item {
20+FocusScope {
2121 id: root
2222
2323 property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin