git.iko.soy/unity8
on xenial help sign in
Refactor focus handling: remove forceActiveFocus() usage
commit46ef1016e10eb3847a87ae807bedb6d474b683e7 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateTue 4 Aug 2015, 17:09 (11 years ago) parenta6c2aee
3 files changed+4−13
compare with xenial
unifiedsplit
qml/Stages/ApplicationWindow.qml−3 qml/Stages/DesktopStage.qml+2−7 tests/qmltests/Stages/tst_DesktopStage.qml+2−3
qml/Stages/ApplicationWindow.qml−3
@@ -135,9 +135,6 @@ FocusScope {
135135 onSurfaceChanged: {
136136 if (sessionContainer.surface) {
137137 surfaceInitTimer.start();
138− if (ApplicationManager.focusedApplicationId == application.appId) {
139− root.forceActiveFocus();
140− }
141138 } else {
142139 d.surfaceInitialized = false;
143140 }
qml/Stages/DesktopStage.qml+2−7
@@ -131,6 +131,7 @@ Rectangle {
131131 id: appContainer
132132 objectName: "appContainer"
133133 anchors.fill: parent
134+ focus: true
134135
135136 Keys.onPressed: {
136137 switch (event.key) {
@@ -206,12 +207,6 @@ Rectangle {
206207 onFocusChanged: {
207208 if (focus && ApplicationManager.focusedApplicationId !== model.appId) {
208209 ApplicationManager.requestFocusApplication(model.appId);
209− decoratedWindow.forceActiveFocus();
210− }
211− }
212− Component.onCompleted: {
213− if (ApplicationManager.focusedApplicationId == model.appId) {
214− decoratedWindow.forceActiveFocus();
215210 }
216211 }
217212
@@ -325,7 +320,7 @@ Rectangle {
325320 windowHeight: appDelegate.height
326321 application: ApplicationManager.get(index)
327322 active: ApplicationManager.focusedApplicationId === model.appId
328− focus: false
323+ focus: true
329324
330325 onClose: ApplicationManager.stopApplication(model.appId)
331326 onMaximize: appDelegate.maximize()
tests/qmltests/Stages/tst_DesktopStage.qml+2−3
@@ -61,7 +61,6 @@ Rectangle {
6161 Component.onDestruction: {
6262 desktopStageLoader.itemDestroyed = true;
6363 }
64− focus: true
6564 }
6665 }
6766 }
@@ -142,8 +141,8 @@ Rectangle {
142141
143142 function test_appFocusSwitch_data() {
144143 return [
145− {tag: "dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
146− {tag: "dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
144+ {tag: "dash to dialer", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 0, focusTo: 1 },
145+ {tag: "dialer to dash", apps: [ "unity8-dash", "dialer-app", "camera-app" ], focusfrom: 1, focusTo: 0 },
147146 ]
148147 }
149148