git.iko.soy/unity8
on xenial help sign in
Merge tryWideView focus refactor from dandrader
b05142cMichael Terry
tests/qmltests/Greeter/tst_WideView.qml+2−4
compare with xenial
unifiedsplit
@@ -26,6 +26,7 @@ StyledItem {
26 id: root
26 id: root
27 width: units.gu(120)
27 width: units.gu(120)
28 height: units.gu(80)
28 height: units.gu(80)
29+ focus: true
29
30
30 theme.name: "Ubuntu.Components.Themes.SuruDark"
31 theme.name: "Ubuntu.Components.Themes.SuruDark"
31
32
@@ -41,6 +42,7 @@ StyledItem {
41 id: loader
42 id: loader
42 width: root.width - controls.width
43 width: root.width - controls.width
43 height: parent.height
44 height: parent.height
45+ focus: true
44
46
45 property bool itemDestroyed: false
47 property bool itemDestroyed: false
46 sourceComponent: Component {
48 sourceComponent: Component {
@@ -58,10 +60,6 @@ StyledItem {
58 locked: lockedCheckBox.checked
60 locked: lockedCheckBox.checked
59 inputMethod: fakeInputMethod
61 inputMethod: fakeInputMethod
60
62
61− Component.onCompleted: {
62− forceActiveFocus();
63− }
64−
65 Component.onDestruction: {
63 Component.onDestruction: {
66 loader.itemDestroyed = true
64 loader.itemDestroyed = true
67 }
65 }