Compiz

Merge lp://staging/~mar-kolya/compiz/fix-for-1186426 into lp://staging/compiz/0.9.10

fix-for-1186426
Merge into 0.9.10

Proposed by kolya on 2013-05-31

Status:

Merged

Approved by:

Sam Spilsbury on 2013-06-01

Approved revision:

3733

Merged at revision:

3732

Proposed branch:

lp://staging/~mar-kolya/compiz/fix-for-1186426

Merge into:

lp://staging/compiz/0.9.10

Diff against target:

12 lines (+1/-1)

1 file modified

plugins/staticswitcher/src/staticswitcher.cpp (+1/-1)

To merge this branch:

bzr merge lp://staging/~mar-kolya/compiz/fix-for-1186426

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-06-01
Sam Spilsbury		2013-05-31	Approve on 2013-06-01
MC Return			Approve on 2013-05-31
Review via email: mp+166912@code.staging.launchpad.net

Commit message

When static switcher is enabled and has an option to show application icon turned on the icons are expected to be ~1/3 of a thumbnail (48px). Instead they are displayed in 512px size and completely cover everything. This change addresses this issue. See LP #1173914.

Description of the change

This change partly reverts change introduced by 1173914 in order to fix a regression in staticswitcher.

The problem: when static switcher is enabled and has an option to show application icon turned on the icons are expected to be ~1/3 of a thumbnail (48px). Instead they are displayed in 512px size and completely cover everything.