Compiz

Merge lp://qastaging/~brandontschaefer/compiz/lp.1034616-fix into lp://qastaging/compiz/0.9.9

lp.1034616-fix
Merge into 0.9.9

Proposed by Brandon Schaefer on 2013-02-27

Status:

Merged

Approved by:

Sam Spilsbury on 2013-02-27

Approved revision:

3624

Merged at revision:

3626

Proposed branch:

lp://qastaging/~brandontschaefer/compiz/lp.1034616-fix

Merge into:

lp://qastaging/compiz/0.9.9

Diff against target:

30 lines (+7/-2)

2 files modified

src/privatescreen.h (+5/-0)
src/window.cpp (+2/-2)

To merge this branch:

bzr merge lp://qastaging/~brandontschaefer/compiz/lp.1034616-fix

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Sam Spilsbury		2013-02-27	Approve on 2013-02-27
PS Jenkins bot	continuous-integration		Pending
Review via email: mp+150718@code.qastaging.launchpad.net

Commit message

Move CompScreenImpl::focusTopMostWindow() over to use the serverWindows list, as its more up-to-date. Now lowering a window will have an up-to-date stacking order.

(LP: #1034616)

Description of the change

=== Problem ===
focusTopMostWindow() was using the windows() lits. This list is updated by the server which means its not always as up-to-date as the serverWindows list. So when we would call lower() everything would be re-stacked but the server hadn't updated the windows() list which meant the lowered window was stilled on top. So it would just focus that window again.

=== Fix ===
Switch over to using the serverWindows list.

=== Test ===
Theres an AP test in unity that caught this problem.

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2013-02-27:

As discussed, this is the correct way of doing it. Thanks.

It might be possible to throw a system test into the mix too - now that we have testhelper, we can write AP-like tests for compiz that run atop of xorg-gtest. Have a look into that if you get the chance.

review: Approve

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2013-02-27:

O nice, I was looking through the systems tests and couldn't find a nice place for it. Ill look into that tomorrow!