Merge lp:~muktupavels/compiz/fix-icon-size-in-switcher into lp:compiz/0.9.12

[Alberts Muktupāvels]

Change icon size back to 48px in application switcher plugin.

Change icon size back to 48px in application switcher plugin.

[Dmitry Shachnev (mitya57)]

I would just store the constant in float to avoid casting, but this is fine as well (compiler should optimize it anyway).

review: Approve

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'plugins/switcher/src/switcher.cpp'
--- plugins/switcher/src/switcher.cpp	2014-11-21 13:52:50 +0000
+++ plugins/switcher/src/switcher.cpp	2015-07-25 20:04:23 +0000
@@ -892,8 +892,10 @@
 					int                  y,
 					GLTexture            *icon)
 {
-    sAttrib.xScale = (float) ICON_SIZE / icon->width ();
-    sAttrib.yScale = (float) ICON_SIZE / icon->height ();
+    const unsigned short SWITCHER_ICON_SIZE = 48;
+
+    sAttrib.xScale = (float) SWITCHER_ICON_SIZE / icon->width ();
+    sAttrib.yScale = (float) SWITCHER_ICON_SIZE / icon->height ();
     if (sAttrib.xScale < sAttrib.yScale)
 	sAttrib.yScale = sAttrib.xScale;
     else