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

[Andrea Azzarone]

Highlights bfb launcher icon during key navigation.

To test:
* press ALT+F1
* the launcher icon should be like this (https://bugs.launchpad.net/unity/+bug/849561/+attachment/2605217/+files/bfb85.png)

[Tim Penhey (thumper)]

The code looks fine.

review: Approve

[Tim Penhey (thumper)]

Andrea, can I get you to add a manual test for this?

Due to the visual nature of the change, we aren't going to have an automated test for this, but recording the expected behaviour in a manual test would be good.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

Done.

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

It's fine now.

review: Approve

[Andrea Azzarone (azzar1)]

Approved by Design Team... https://bugs.launchpad.net/unity/+bug/849561/comments/19

[John Lea (johnlea)]

Reviewed and signed off by design, thx!

Let's also discuss this bug in Budapest, there are a couple of asset changes that we might want to play with, but this is easier to do when we are sitting face to face.

review: Approve (design review)

[Tim Penhey (thumper)]

review: Approve

=== added file 'manual-tests/HighlightedBFB.txt'
--- manual-tests/HighlightedBFB.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/HighlightedBFB.txt	2011-11-30 01:27:24 +0000
@@ -0,0 +1,12 @@
+Test highlight BFB
+=====================
+
+This test shows that the BFB launcher icon highlights during key navigation.
+
+#. Start with a clear screen
+#. Press ALT+F1
+
+Outcome
+  The launcher key navigation starts and the BFB launcher icon highlights.
+  It looks like `this`__:
+  __https://launchpadlibrarian.net/85700200/bfb85.png

=== added file 'plugins/unityshell/resources/squircle_base_selected_54.png'
Binary files plugins/unityshell/resources/squircle_base_selected_54.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/squircle_base_selected_54.png	2011-11-30 01:27:24 +0000 differ
=== added file 'plugins/unityshell/resources/squircle_glow_54.png'
Binary files plugins/unityshell/resources/squircle_glow_54.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/squircle_glow_54.png	2011-11-30 01:27:24 +0000 differ
=== modified file 'plugins/unityshell/src/BFBLauncherIcon.cpp'
--- plugins/unityshell/src/BFBLauncherIcon.cpp	2011-10-06 04:18:36 +0000
+++ plugins/unityshell/src/BFBLauncherIcon.cpp	2011-11-30 01:27:24 +0000
@@ -38,7 +38,7 @@
   SetQuirk(QUIRK_RUNNING, false);
   SetIconType(TYPE_HOME);
 
-  _background_color = nux::Color (0xFF333333);
+  _background_color = nux::color::White;
 
   mouse_enter.connect([&] () { _ubus_manager.SendMessage(UBUS_DASH_ABOUT_TO_SHOW, NULL); });
 }

=== modified file 'plugins/unityshell/src/IconRenderer.cpp'
--- plugins/unityshell/src/IconRenderer.cpp	2011-10-26 21:48:41 +0000
+++ plugins/unityshell/src/IconRenderer.cpp	2011-11-30 01:27:24 +0000
@@ -180,6 +180,8 @@
 nux::BaseTexture* arrow_empty_rtl = 0;
 
 nux::BaseTexture* squircle_base = 0;
+nux::BaseTexture* squircle_base_selected = 0;
+nux::BaseTexture* squircle_glow = 0;
 nux::BaseTexture* squircle_shine = 0;
 
 std::vector<nux::BaseTexture*> icon_background;
@@ -386,6 +388,7 @@
   float glow_intensity = arg.glow_intensity;
 
   nux::BaseTexture* background = local::icon_background[size];
+  nux::BaseTexture* glow = local::icon_glow[size];
   nux::BaseTexture* shine = local::icon_shine[size];
 
   if (arg.keyboard_nav_hl)
@@ -401,11 +404,11 @@
 
   if (arg.system_item)
   {
-    background_color = nux::color::White;
-    backlight_intensity = 1.0f;
-    glow_intensity = 0.0f;
+    backlight_intensity = (arg.keyboard_nav_hl) ? 0.85f : 1.0f ;
+    glow_intensity = (arg.keyboard_nav_hl) ? 1.0f : 0.0f ;
 
-    background = local::squircle_base;
+    background = (arg.keyboard_nav_hl) ? local::squircle_base_selected : local::squircle_base;
+    glow = local::squircle_glow;
     shine = local::squircle_shine;
   }
 
@@ -456,7 +459,7 @@
   {
     RenderElement(GfxContext,
                   arg,
-                  local::icon_glow[size]->GetDeviceTexture(),
+                  glow->GetDeviceTexture(),
                   glow_color,
                   glow_intensity * arg.alpha,
                   arg.icon->GetTransform(launcher::AbstractLauncherIcon::TRANSFORM_GLOW));
@@ -1092,6 +1095,8 @@
                     PKGDATADIR"/launcher_icon_shine_54.png");
 
   squircle_base = load_texture(PKGDATADIR"/squircle_base_54.png");
+  squircle_base_selected = load_texture(PKGDATADIR"/squircle_base_selected_54.png");
+  squircle_glow = load_texture(PKGDATADIR"/squircle_glow_54.png");
   squircle_shine = load_texture(PKGDATADIR"/squircle_shine_54.png");
 
   pip_ltr = load_texture(PKGDATADIR"/launcher_pip_ltr.png");