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

[kolya]

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.

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.

[MC Return (mc-return)]

Sorry, I did not notice introducing this bug.
+1 for fixing it.

review: Approve

[MC Return (mc-return)]

Please add a commit message above also. Thanks :)

[kolya (mar-kolya)]

> Please add a commit message above also. Thanks :)

Done.

I hope you won't mind me asking stupid question: it looks like I've accidentally pushed a change to debian/changelog into this branch. Shall I add a commit reverting it or is it fine as is?

[MC Return (mc-return)]

I think it would be better to revert this change indeed as the changelog will be updated automatically AFAIK...

[MC Return (mc-return)]

In the mid-term all of those values should be made configurable via CCSM, so one could set up ideal previewsize, bordersize and icon size individually...

[lp:~mar-kolya/compiz/fix-for-1186426]

3733. By kolya on 2013-06-01

Revert accidental debian/changelog change

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/staticswitcher/src/staticswitcher.cpp'
--- plugins/staticswitcher/src/staticswitcher.cpp	2013-05-12 08:24:06 +0000
+++ plugins/staticswitcher/src/staticswitcher.cpp	2013-06-01 00:12:26 +0000
@@ -27,7 +27,7 @@
 
 COMPIZ_PLUGIN_20090315 (staticswitcher, StaticSwitchPluginVTable)
 
-const unsigned short MAX_ICON_SIZE = 512;
+const unsigned short ICON_SIZE = 48;
 
 const unsigned short PREVIEWSIZE = 150;
 const unsigned short BORDER = 10;