git.iko.soy/unity8
on xenial help sign in
fix focusing issues
2d75060Michael Zanetti
qml/Stages/DesktopStage.qml+5−4
compare with xenial
unifiedsplit
@@ -94,7 +94,6 @@ Rectangle {
94 if (appDelegate.state === "minimized") {
94 if (appDelegate.state === "minimized") {
95 appDelegate.state = "normal"
95 appDelegate.state = "normal"
96 }
96 }
97− appDelegate.focusWindow();
98 ApplicationManager.focusApplication(appId);
97 ApplicationManager.focusApplication(appId);
99 }
98 }
100 }
99 }
@@ -158,8 +157,10 @@ Rectangle {
158 readonly property int minWidth: units.gu(10)
157 readonly property int minWidth: units.gu(10)
159 readonly property int minHeight: units.gu(10)
158 readonly property int minHeight: units.gu(10)
160
159
161− function focusWindow() {
160+ onFocusChanged: {
161+ if (focus) {
162− ApplicationManager.requestFocusApplication(model.appId);
162+ ApplicationManager.requestFocusApplication(model.appId);
163+ }
163 }
164 }
164
165
165 states: [
166 states: [
@@ -276,7 +277,7 @@ Rectangle {
276 property bool upperThirdContainsMouse: containsMouse && mouseY < height / 3
277 property bool upperThirdContainsMouse: containsMouse && mouseY < height / 3
277 onClicked: {
278 onClicked: {
278 print("clicked")
279 print("clicked")
279− appDelegate.focusWindow()
280+ appDelegate.focus = true
280 root.state = ""
281 root.state = ""
281 }
282 }
282 }
283 }