Merge lp:~victored/unity/fixes into lp:unity

[Victor Martinez]

Fix for lp:702989

This is an attempt to fix lp:702989

Since the height of the icons in the launcher is an even number, having something vertically centered is not possible. For the Tooltips and QuickLists, the y-center is located at '... + Height/2', so for a 48px icon height this would result in +24.

As similar algorithms are used to calculate the center of the icons everywhere, what needs to be fixed are not the tooltips and quicklists, but the icon indicators (arrows for active and open states), which are located at the middle using a different approach: the arrows are .png images of 19px height (whose center is located at +10 pixels from the top), so this time (as you can see in the function RenderIndicators) the y-coordinates are given by 'center - Height/2'.

For a 48px icon height, the operation would be: '24 - 19/2', rounded to '24 - 9' = 15. Then, the PNG image is put at +15 pixels from the top of the icon and therefore the center of the indicator at 15+10 = 25, creating a +1px offset.

Subtracting 1px to each y-coordinate at the end of the 'RenderIndicators' function solves the problem for every icon size.

[Mirco Müller (macslow)]

Nice fix to the ugly truth that launcher-icons with and even height can't center-line align with the tooltips. Works as advertised.

I'm good to merge that into unity trunk, but I need to know if you've signed the Canonical contributor-agreement. If you haven't done yet so please follow the procedure described here: https://wiki.canonical.com/LegalServices/Forms/ContributorAgreement

Thanks in advance!

review: Needs Information

[Victor Martinez (victored)]

Thanks for the review.

I haven't yet signed the Canonical Contributor Agreement [because my scanner is broken]. I'm doing that ASAP, hopefully this week.

[Mikkel Kamstrup Erlandsen (kamstrup)]

@victor: a digital camera (or even a high quality phone camera) is
also fine if you have access to that

[Victor Martinez (victored)]

@Mikkel: thanks for the advice!

[Victor Martinez (victored)]

Mirco, I'm now a member of the Canonical Contributor Agreement team :)

[Adolfo Jayme Barrientos (fitojb)]

review: Approve

[Mirco Müller (macslow)]

Approved... mergeing it now.

review: Approve

=== modified file 'plugins/unityshell/src/IconRenderer.cpp'
--- plugins/unityshell/src/IconRenderer.cpp	2011-08-30 16:48:12 +0000
+++ plugins/unityshell/src/IconRenderer.cpp	2011-09-10 18:49:23 +0000
@@ -810,7 +810,7 @@
         break;
       
       GfxContext.QRP_1Tex(markerX,
-                          center - ((texture->GetHeight() * scale) / 2),
+                          center - ((texture->GetHeight() * scale) / 2) - 1,
                           (float) texture->GetWidth() * scale,
                           (float) texture->GetHeight() * scale,
                           texture->GetDeviceTexture(),
@@ -825,7 +825,7 @@
 
     nux::Color color = nux::color::LightGrey * alpha;
     GfxContext.QRP_1Tex((geo.x + geo.width) - local::arrow_rtl->GetWidth(),
-                        markerCenter - (local::arrow_rtl->GetHeight() / 2),
+                        markerCenter - (local::arrow_rtl->GetHeight() / 2) - 1,
                         (float) local::arrow_rtl->GetWidth(),
                         (float) local::arrow_rtl->GetHeight(),
                         local::arrow_rtl->GetDeviceTexture(),