Merge lp:~nicovdw/unity/fix-for-731212 into lp:unity

[Nico van der Walt]

This patch fixes the alignment and sizing issue on the launcher icons shortcut labels when holding down the super key and a different icon size than the default of 48 is selected.

The other launcher items (first 10 items) are hard coded during initialization of the launcher for the default size of 48.

[Didier Roche-Tolomelli (didrocks)]

Hey Nico,

TBH, I'm quite unsure about that patch, I would prefer to remove everywhere all the hardcoded values rather than adding more. Can you have a look at see if you can remove/calcule and _icon_size depending on the scale?

Thanks a bunch :)

review: Disapprove

[Didier Roche-Tolomelli (didrocks)]

Setting the state to superseeded as you already fixed it

Unmerged revisions

970. By Nico van der Walt on 2011-03-19

Fix for LP: #731212 where 'Applications' and 'Files & Folders' keyboard shortcuts did not align properly

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-03-18 18:35:33 +0000
+++ src/Launcher.cpp	2011-03-19 11:06:35 +0000
@@ -1939,9 +1939,9 @@
     // needs to be disconnected
     icon->needs_redraw.connect (sigc::mem_fun(this, &Launcher::OnIconNeedsRedraw));
 
-   guint64 shortcut = icon->GetShortcut ();
+    guint64 shortcut = icon->GetShortcut ();
     if (shortcut != 0 && !g_ascii_isdigit ((gchar) shortcut))
-      icon->SetSuperkeyLabel (cairoToTexture2D ((gchar) shortcut, _icon_size, _icon_size));
+      icon->SetSuperkeyLabel (cairoToTexture2D ((gchar) shortcut, 54, 54));
 
     AddChild (icon);
 }