git.iko.soy/unity8
on xenial help sign in
Test
commit8884c5863162930755a3d4ade81965f363f729e1 authorMichael Terry <michael.terry@canonical.com> dateTue 29 Oct 2013, 16:39 (13 years ago) parentaa49fd3
3 files changed+15−22
compare with xenial
unifiedsplit
Components/BasicShell.qml+12 GreeterShell.qml+2−7 Shell.qml+1−15
Components/BasicShell.qml+12
@@ -71,4 +71,16 @@ FocusScope {
7171 Keys.onVolumeDownPressed: volumeControl.volumeDown()
7272
7373 focus: true
74+ onFocusChanged: if (!focus) forceActiveFocus();
75+
76+ Binding {
77+ target: i18n
78+ property: "domain"
79+ value: "unity8"
80+ }
81+
82+ OSKController {
83+ anchors.topMargin: panel.panelHeight
84+ anchors.fill: parent // as needs to know the geometry of the shell
85+ }
7486}
GreeterShell.qml+2−7
@@ -114,10 +114,10 @@ BasicShell {
114114 }
115115 greeter.forceActiveFocus();
116116 }
117− else if (LightDM.Greeter.promptless)
118− login();
119117 }
120118
119+ onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress == 0) login()
120+
121121 onUnlocked: login()
122122 onSelected: {
123123 // Update launcher items for new user
@@ -188,11 +188,6 @@ BasicShell {
188188 }
189189 }
190190
191− OSKController {
192− anchors.topMargin: panel.panelHeight
193− anchors.fill: parent // as needs to know the geometry of the shell
194− }
195−
196191 Connections {
197192 id: powerConnection
198193 target: Powerd
Shell.qml+1−15
@@ -340,7 +340,7 @@ BasicShell {
340340
341341 width: shell.edgeSize
342342 direction: Direction.Leftwards
343− enabled: greeter.showProgress == 0 && edgeDemo.dashEnabled
343+ enabled: edgeDemo.dashEnabled
344344 property bool haveApps: mainStage.applications.count > 0 || sideStage.applications.count > 0
345345
346346 maxTotalDragDistance: haveApps ? parent.width : parent.width * 0.7
@@ -557,9 +557,6 @@ BasicShell {
557557 }
558558 }
559559
560− focus: true
561− onFocusChanged: if (!focus) forceActiveFocus();
562−
563560 InputFilterArea {
564561 anchors {
565562 top: parent.top
@@ -570,17 +567,6 @@ BasicShell {
570567 blockInput: true
571568 }
572569
573− Binding {
574− target: i18n
575− property: "domain"
576− value: "unity8"
577− }
578−
579− OSKController {
580− anchors.topMargin: panel.panelHeight
581− anchors.fill: parent // as needs to know the geometry of the shell
582− }
583−
584570 //FIXME: This should be handled in the input stack, keyboard shouldnt propagate
585571 MouseArea {
586572 anchors.bottom: parent.bottom