Merge lp:~aacid/unity-2d/unity-2d_remove_last_window_active into lp:unity-2d

Proposed by Albert Astals Cid
Status: Merged
Approved by: Florian Boucault
Approved revision: 903
Merged at revision: 903
Proposed branch: lp:~aacid/unity-2d/unity-2d_remove_last_window_active
Merge into: lp:unity-2d
Diff against target: 22 lines (+0/-5)
1 file modified
spread/Workspaces.qml (+0/-5)
To merge this branch: bzr merge lp:~aacid/unity-2d/unity-2d_remove_last_window_active
Reviewer Review Type Date Requested Status
Florian Boucault Pending
Gerry Boland Pending
Review via email: mp+91882@code.launchpad.net

Description of the change

[workspace switcher] Fixed workspace switcher activation.

DesktopInfo does not have an 'activeWindow' property anymore, luckily it was not actually used but by 'lastActiveWindow' that was not itself used.

UNBLOCK

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'spread/Workspaces.qml'
2--- spread/Workspaces.qml 2012-01-31 15:09:02 +0000
3+++ spread/Workspaces.qml 2012-02-07 17:09:32 +0000
4@@ -73,7 +73,6 @@
5 screen. Each workspace will individually filter them to select only those that
6 belong to it. */
7 property variant allWindows: WindowsList { }
8- property int lastActiveWindow: 0
9
10 /* Group all Workspace elements into a single Item to help workspaceByNumber
11 iterate over less items than it would need to if the Repeater was adding children
12@@ -209,10 +208,6 @@
13 }
14
15 function show() {
16- /* Save the currently active window before showing and activating the switcher,
17- so that we can use it to pre-select the active window on the workspace */
18- lastActiveWindow = desktop.activeWindow
19-
20 allWindows.load()
21
22 spreadView.show()

Subscribers

People subscribed via source and target branches