Unity

Merge lp://staging/~3v1n0/unity/single-workspace-scale-fix into lp://staging/unity

single-workspace-scale-fix
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2012-06-29

Status:

Merged

Approved by:

Marco Trevisan (Treviño) on 2012-06-29

Approved revision:

no longer in the source branch.

Merged at revision:

2456

Proposed branch:

lp://staging/~3v1n0/unity/single-workspace-scale-fix

Merge into:

lp://staging/unity

Diff against target:

92 lines (+38/-5)

2 files modified

tests/autopilot/unity/tests/launcher/test_icon_behavior.py (+29/-2)
unity-shared/PluginAdapterCompiz.cpp (+9/-3)

To merge this branch:

bzr merge lp://staging/~3v1n0/unity/single-workspace-scale-fix

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
jenkins (community)	continuous-integration		Approve on 2012-06-30
Brandon Schaefer (community)		2012-06-29	Approve on 2012-06-29
Review via email: mp+112867@code.staging.launchpad.net

Commit message

PluginAdapterCompiz: ignore offscreen windows when looking for the top one

Description of the change

It can happen that the compiz window->defaultViewport() does not always return an invalid value when there are offscreen windows. For example the bug #996604 seems caused by "gtk-window-decorator" windows like this one: http://pastebin.ubuntu.com/1066811/ that according to compiz are in the same workspace of the window we're trying to focus, even if they're actually outside it.

So, to fix the issue we now ensure that the workspace geometry of the window we're checking is actually intersecting the window geometry.

Tests covered by already written manual tests, and new AP test.

Revision history for this message