@@ -47,8 +47,8 @@ FocusScope {
4747 if (appDelegate.state === "minimized") {
4848 appDelegate.state = "normal"
4949 }
50− appDelegate.focusWindow();
5150 ApplicationManager.focusApplication(appId);
51+ appDelegate.focus = true;
5252 }
5353 }
5454
@@ -87,20 +87,22 @@ FocusScope {
8787 id: appRepeater
8888 model: ApplicationManager
8989
90− delegate: Item {
90+ delegate: FocusScope {
9191 id: appDelegate
9292 z: ApplicationManager.count - index
9393 y: units.gu(3)
9494 width: units.gu(60)
9595 height: units.gu(50)
9696
97+ onFocusChanged: {
98+ if (focus) {
99+ ApplicationManager.requestFocusApplication(model.appId);
100+ }
101+ }
102+
97103 readonly property int minWidth: units.gu(10)
98104 readonly property int minHeight: units.gu(10)
99105
100− function focusWindow() {
101− decoratedWindow.window.forceActiveFocus();
102− }
103−
104106 states: [
105107 State {
106108 name: "normal"
@@ -127,7 +129,7 @@ FocusScope {
127129 resizeHandleWidth: units.gu(0.5)
128130 windowId: model.appId // FIXME: Change this to point to windowId once we have such a thing
129131
130− onPressed: decoratedWindow.focus = true;
132+ onPressed: appDelegate.focus = true;
131133 }
132134
133135 DecoratedWindow {
@@ -136,12 +138,7 @@ FocusScope {
136138 anchors.fill: parent
137139 application: ApplicationManager.get(index)
138140 active: ApplicationManager.focusedApplicationId === model.appId
139−
140− onFocusChanged: {
141− if (focus) {
142− ApplicationManager.requestFocusApplication(model.appId);
143− }
144− }
141+ focus: true
145142
146143 onClose: ApplicationManager.stopApplication(model.appId)
147144 onMaximize: appDelegate.state = (appDelegate.state == "maximized" ? "normal" : "maximized")