Merge lp:~azzar1/unity/fix-1049601 into lp:unity

[Andrea Azzarone]

Update shortcut overlay visual design.

== Problem ==
Launcher - The shortcut overlays that are displayed on top of Launcher icons when the SUPER key is held down need to use the correct assets, and be tinted with the average background colour.

== Test ==
Not applicable: visual change.

Screenshot: https://bugs.launchpad.net/unity/+bug/1049601/+attachment/3418861/+files/launcher_shortcuts.png

[Marco Trevisan (Treviño) (3v1n0)]

Check if you can use a map of smart pointers for the textures without being too invasive, also it would be nice if you'd use an auto const& in the foreach... Anyway overall this is already fine for me.

review: Approve

[John Lea (johnlea)]

review: Approve (design)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-10-29 09:34:54 +0000
+++ launcher/Launcher.cpp	2012-10-30 16:46:32 +0000
@@ -1163,6 +1163,8 @@
 
 void Launcher::OnBGColorChanged(GVariant *data)
 {
+  ui::IconRenderer::DestroyShortcutTextures();
+
   double red = 0.0f, green = 0.0f, blue = 0.0f, alpha = 0.0f;
 
   g_variant_get(data, "(dddd)", &red, &green, &blue, &alpha);
@@ -1607,6 +1609,8 @@
 
 void Launcher::SetIconSize(int tile_size, int icon_size)
 {
+  ui::IconRenderer::DestroyShortcutTextures();
+
   _icon_size = tile_size;
   _icon_image_size = icon_size;
   _icon_image_size_delta = tile_size - icon_size;

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2012-10-17 22:13:25 +0000
+++ unity-shared/IconRenderer.cpp	2012-10-30 16:46:32 +0000
@@ -414,6 +414,8 @@
   nux::BaseTexture* shine = local::icon_shine[size];
   nux::BaseTexture* shadow = local::icon_shadow[size];
 
+  nux::Color shortcut_color = arg.colorify;
+
   bool force_filter = icon_size != background->GetWidth();
 
   if (backlight_intensity == 0.0f)
@@ -632,7 +634,7 @@
     char shortcut = (char) arg.shortcut_label;
 
     if (local::label_map.find(shortcut) == local::label_map.end())
-      local::label_map[shortcut] = RenderCharToTexture(shortcut, icon_size, icon_size);
+      local::label_map[shortcut] = RenderCharToTexture(shortcut, icon_size, icon_size, shortcut_color);
 
     RenderElement(GfxContext,
                   arg,
@@ -645,7 +647,7 @@
   }
 }
 
-nux::BaseTexture* IconRenderer::RenderCharToTexture(const char label, int width, int height)
+nux::BaseTexture* IconRenderer::RenderCharToTexture(char label, int width, int height, nux::Color const& bg_color)
 {
   nux::BaseTexture*     texture  = NULL;
   nux::CairoGraphics*   cg       = new nux::CairoGraphics(CAIRO_FORMAT_ARGB32,
@@ -657,22 +659,26 @@
   GtkSettings*          settings = gtk_settings_get_default();  // not ref'ed
   gchar*                fontName = NULL;
 
-  double label_pos = double(icon_size / 3.0f);
-  double text_size = double(icon_size / 4.0f);
-  double label_x = label_pos;
-  double label_y = label_pos;
-  double label_w = label_pos;
-  double label_h = label_pos;
-  double label_r = 3.0f;
+  double label_ratio = 0.44f;
+  double label_size = icon_size * label_ratio;
+  double label_x = (icon_size - label_size) / 2;
+  double label_y = (icon_size - label_size) / 2;
+  double label_w = label_size;
+  double label_h = label_size;
+  double label_radius = 3.0f;
 
   cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
   cairo_paint(cr);
   cairo_scale(cr, 1.0f, 1.0f);
   cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-  cg->DrawRoundedRectangle(cr, 1.0f, label_x, label_y, label_r, label_w, label_h);
-  cairo_set_source_rgba(cr, 0.0f, 0.0f, 0.0f, 0.65f);
+  cg->DrawRoundedRectangle(cr, 1.0f, label_x, label_y, label_radius, label_w, label_h);
+  cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.75f);
+  cairo_fill_preserve(cr);
+  cairo_set_source_rgba(cr, bg_color.red, bg_color.green, bg_color.blue, 0.20f);
   cairo_fill(cr);
 
+  double text_ratio = 0.75;
+  double text_size = label_size * text_ratio; 
   layout = pango_cairo_create_layout(cr);
   g_object_get(settings, "gtk-font-name", &fontName, NULL);
   desc = pango_font_description_from_string(fontName);
@@ -1049,6 +1055,13 @@
   local::destroy_textures();
 }
 
+void IconRenderer::DestroyShortcutTextures()
+{
+  for (auto texture : local::label_map)
+    texture.second->UnReference();
+  local::label_map.clear();
+}
+
 void IconRenderer::GetInverseScreenPerspectiveMatrix(nux::Matrix4& ViewMatrix, nux::Matrix4& PerspectiveMatrix,
                                                      int ViewportWidth,
                                                      int ViewportHeight,
@@ -1287,9 +1300,7 @@
   squircle_shadow->UnReference();
   squircle_shine->UnReference();
 
-  for (auto it = label_map.begin(), end = label_map.end(); it != end; ++it)
-    it->second->UnReference();
-  label_map.clear();
+  IconRenderer::DestroyShortcutTextures();
 
   textures_created = false;
 }

=== modified file 'unity-shared/IconRenderer.h'
--- unity-shared/IconRenderer.h	2012-10-11 20:01:44 +0000
+++ unity-shared/IconRenderer.h	2012-10-30 16:46:32 +0000
@@ -46,9 +46,10 @@
   void SetTargetSize(int tile_size, int image_size, int spacing);
 
   static void DestroyTextures();
+  static void DestroyShortcutTextures();
 
 protected:
-  nux::BaseTexture* RenderCharToTexture(const char label, int width, int height);
+  nux::BaseTexture* RenderCharToTexture(char label, int width, int height, nux::Color const& bg_color);
 
   void RenderElement(nux::GraphicsEngine& GfxContext,
                      RenderArg const& arg,