Merge lp:~3v1n0/unity/new-launcher-assets into lp:unity

[Marco Trevisan (Treviño)]

Launcher/Switcher: update icon assets to match new designs, fix spacing and shapes.

Updated the unity assets, using the ones provided by design. Spacing values updated in switcher and fixed drawing issue (now we draw the text in a new layer).

BFB and HUD icons moved to squared shape.

Screenshot for reference: http://i.imgur.com/OsLQN.jpg

[Adolfo Jayme Barrientos (fitojb)]

The borders in Launcher tiles seem to be missing after comparing with https://launchpadlibrarian.net/123625130/preview-new-launcher-icons.png

Of course, I'm no John :-P

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

> The borders in Launcher tiles seem to be missing after comparing with https://launchpadlibrarian.net/123625130/preview-new-launcher-icons.png

Yeah, I've noticed... But I'm just using the assets they gave, so
probably they should be tuned a little...

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

> The borders in Launcher tiles seem to be missing after comparing with
> https://launchpadlibrarian.net/12362513

Yeah, I've noticed... But I'm just using the assets they gave, so
probably they should be tuned a little...

For example, increasing the opacity of the assets resources/launcher_icon_edge_* I can get this result http://i.imgur.com/uP4vD.png
http://i.imgur.com/uP4vD.png

[lp:~3v1n0/unity/new-launcher-assets]

2924. By Marco Trevisan (Treviño) on 2012-11-22

IconRenderer: don't use squircle textures for system icons anymore

2925. By Marco Trevisan (Treviño) on 2012-11-22

Launcher: set back HUD and HOME as system items for icon renderer.

2926. By Marco Trevisan (Treviño) on 2012-11-22

resources: update BFB icon with higher resolution one

[John Lea (johnlea)]

review: Approve

[John Lea (johnlea)]

One thing to note didrocks says "that some assets can might need to be in unity asset pool, please check that all assets are also in this pool if needed"

Also as soon as this has landed and I am back in the office I will do another review with the visual designers and report back.

[Marco Biscaro (marcobiscaro2112)]

114 -nux::BaseTexture* squircle_base = 0;
115 -nux::BaseTexture* squircle_base_selected = 0;
116 -nux::BaseTexture* squircle_edge = 0;
117 -nux::BaseTexture* squircle_glow = 0;
118 -nux::BaseTexture* squircle_shadow = 0;
119 -nux::BaseTexture* squircle_shine = 0;
120 +// nux::BaseTexture* squircle_base = 0;
121 +// nux::BaseTexture* squircle_base_selected = 0;
122 +// nux::BaseTexture* squircle_edge = 0;
123 +// nux::BaseTexture* squircle_glow = 0;
124 +// nux::BaseTexture* squircle_shadow = 0;
125 +// nux::BaseTexture* squircle_shine = 0;

146 - squircle_base = load_texture(PKGDATADIR"/squircle_base_54.png");
147 - squircle_base_selected = load_texture(PKGDATADIR"/squircle_base_selected_54.png");
148 - squircle_edge = load_texture(PKGDATADIR"/squircle_edge_54.png");
149 - squircle_glow = load_texture(PKGDATADIR"/squircle_glow_62.png");
150 - squircle_shadow = load_texture(PKGDATADIR"/squircle_shadow_62.png");
151 - squircle_shine = load_texture(PKGDATADIR"/squircle_shine_54.png");
152 + // squircle_base = load_texture(PKGDATADIR"/squircle_base_54.png");
153 + // squircle_base_selected = load_texture(PKGDATADIR"/squircle_base_selected_54.png");
154 + // squircle_edge = load_texture(PKGDATADIR"/squircle_edge_54.png");
155 + // squircle_glow = load_texture(PKGDATADIR"/squircle_glow_62.png");
156 + // squircle_shadow = load_texture(PKGDATADIR"/squircle_shadow_62.png");
157 + // squircle_shine = load_texture(PKGDATADIR"/squircle_shine_54.png");

165 - squircle_base->UnReference();
166 - squircle_base_selected->UnReference();
167 - squircle_edge->UnReference();
168 - squircle_glow->UnReference();
169 - squircle_shadow->UnReference();
170 - squircle_shine->UnReference();
171 + // squircle_base->UnReference();
172 + // squircle_base_selected->UnReference();
173 + // squircle_edge->UnReference();
174 + // squircle_glow->UnReference();
175 + // squircle_shadow->UnReference();
176 + // squircle_shine->UnReference();

Why are these lines commented instead of removed?

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

@JohnLea: Ok, I was in contact with Matthieu to improve the rendering of these (since this is not fine yet)... I already did some experiments with it, so once you'll be back I'll be happy to continue this work.

@Marco: yeah, I know, I removed them locally, but this branch was still somewhat in WIP. I'll fix them on upcoming versions.

[John Lea (johnlea)]

@Treviño: cool, iterate with Matthieu, and when ready ask Matthieu to approve the merge (if Matthieu is happy I am happy ;-) Ping me if this gets blocked for any reason. Thanks, John

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2012-11-14 02:21:36 +0000
+++ launcher/SwitcherView.cpp	2012-11-22 19:09:20 +0000
@@ -32,16 +32,21 @@
 namespace switcher
 {
 
+namespace
+{
+  const unsigned int VERTICAL_PADDING = 45;
+}
+
 NUX_IMPLEMENT_OBJECT_TYPE(SwitcherView);
 
 SwitcherView::SwitcherView()
   : render_boxes(false)
   , border_size(50)
-  , flat_spacing(10)
+  , flat_spacing(20)
   , icon_size(128)
   , minimum_spacing(10)
   , tile_size(150)
-  , vertical_size(tile_size + 80)
+  , vertical_size(tile_size + VERTICAL_PADDING * 2)
   , text_size(15)
   , animation_length(250)
   , monitor(-1)
@@ -117,7 +122,7 @@
 void SwitcherView::OnTileSizeChanged (int size)
 {
   icon_renderer_->SetTargetSize(tile_size, icon_size, 10);
-  vertical_size = tile_size + 80;
+  vertical_size = tile_size + VERTICAL_PADDING * 2;
 }
 
 void SwitcherView::SaveLast ()
@@ -581,8 +586,10 @@
 
   if (text_view_->IsVisible())
   {
+    nux::GetPainter().PushPaintLayerStack();
     text_view_->SetBaseY(last_background_.y + last_background_.height - 45);
     text_view_->Draw(GfxContext, force_draw);
+    nux::GetPainter().PopPaintLayerStack();
   }
 
   int ms_since_change = TimeUtil::TimeDelta(&current_, &save_time_);

=== modified file 'resources/launcher_bfb.png'
Binary files resources/launcher_bfb.png	2012-03-14 06:24:18 +0000 and resources/launcher_bfb.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_back_54.png'
Binary files resources/launcher_icon_back_54.png	2011-07-15 04:44:07 +0000 and resources/launcher_icon_back_54.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_edge_150.png'
Binary files resources/launcher_icon_edge_150.png	2011-07-19 18:53:14 +0000 and resources/launcher_icon_edge_150.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_edge_54.png'
Binary files resources/launcher_icon_edge_54.png	2011-07-15 04:44:07 +0000 and resources/launcher_icon_edge_54.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_glow_200.png'
Binary files resources/launcher_icon_glow_200.png	2012-03-14 06:24:18 +0000 and resources/launcher_icon_glow_200.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_glow_62.png'
Binary files resources/launcher_icon_glow_62.png	2011-07-15 04:44:07 +0000 and resources/launcher_icon_glow_62.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_selected_back_150.png'
Binary files resources/launcher_icon_selected_back_150.png	2011-07-19 18:53:14 +0000 and resources/launcher_icon_selected_back_150.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_shadow_200.png'
Binary files resources/launcher_icon_shadow_200.png	2012-02-13 16:29:59 +0000 and resources/launcher_icon_shadow_200.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_shadow_62.png'
Binary files resources/launcher_icon_shadow_62.png	2012-02-13 16:29:59 +0000 and resources/launcher_icon_shadow_62.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_shine_150.png'
Binary files resources/launcher_icon_shine_150.png	2011-07-19 18:53:14 +0000 and resources/launcher_icon_shine_150.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'resources/launcher_icon_shine_54.png'
Binary files resources/launcher_icon_shine_54.png	2011-07-15 04:44:07 +0000 and resources/launcher_icon_shine_54.png	2012-11-22 19:09:20 +0000 differ
=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2012-11-15 20:03:17 +0000
+++ unity-shared/IconRenderer.cpp	2012-11-22 19:09:20 +0000
@@ -68,7 +68,7 @@
 #define LUMIN_GREEN "0.59"
 #define LUMIN_BLUE "0.11"
 
-std::string gPerspectiveCorrectShader = TEXT(
+const std::string gPerspectiveCorrectShader = TEXT(
 "[Vertex Shader]                                    \n"
 VertexShaderHeader
 "uniform mat4 ViewProjectionMatrix;                 \n\
@@ -113,7 +113,7 @@
 }                                                   \n\
 ");
 
-std::string PerspectiveCorrectVtx = TEXT(
+const std::string PerspectiveCorrectVtx = TEXT(
 "!!ARBvp1.0                                 \n\
 ATTRIB iPos         = vertex.position;      \n\
 ATTRIB iColor       = vertex.attrib[3];     \n\
@@ -130,7 +130,7 @@
 MOV   oTexCoord0, vertex.attrib[8];         \n\
 END");
 
-std::string PerspectiveCorrectTexFrg = TEXT(
+const std::string PerspectiveCorrectTexFrg = TEXT(
 "!!ARBfp1.0                                                   \n\
 PARAM color0 = program.local[0];                              \n\
 PARAM factor = program.local[1];                              \n\
@@ -152,7 +152,7 @@
 MOV result.color.a, color;                                    \n\
 END");
 
-std::string PerspectiveCorrectTexRectFrg = TEXT(
+const std::string PerspectiveCorrectTexRectFrg = TEXT(
 "!!ARBfp1.0                                                   \n\
 PARAM color0 = program.local[0];                              \n\
 PARAM factor = program.local[1];                              \n\
@@ -194,12 +194,12 @@
 nux::BaseTexture* arrow_empty_ltr = 0;
 nux::BaseTexture* arrow_empty_rtl = 0;
 
-nux::BaseTexture* squircle_base = 0;
-nux::BaseTexture* squircle_base_selected = 0;
-nux::BaseTexture* squircle_edge = 0;
-nux::BaseTexture* squircle_glow = 0;
-nux::BaseTexture* squircle_shadow = 0;
-nux::BaseTexture* squircle_shine = 0;
+// nux::BaseTexture* squircle_base = 0;
+// nux::BaseTexture* squircle_base_selected = 0;
+// nux::BaseTexture* squircle_edge = 0;
+// nux::BaseTexture* squircle_glow = 0;
+// nux::BaseTexture* squircle_shadow = 0;
+// nux::BaseTexture* squircle_shine = 0;
 
 std::vector<nux::BaseTexture*> icon_background;
 std::vector<nux::BaseTexture*> icon_selected_background;
@@ -470,12 +470,6 @@
     // 0.9f is BACKLIGHT_STRENGTH in Launcher.cpp
     backlight_intensity = (arg.keyboard_nav_hl) ? 0.95f : 0.9f;
     glow_intensity = (arg.keyboard_nav_hl) ? 1.0f : 0.0f ;
-
-    background = local::squircle_base_selected;
-    edge = local::squircle_edge;
-    glow = local::squircle_glow;
-    shine = local::squircle_shine;
-    shadow = local::squircle_shadow;
   }
 
   // draw shadow
@@ -1224,12 +1218,12 @@
                     PKGDATADIR"/launcher_icon_shine_150.png",
                     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_edge = load_texture(PKGDATADIR"/squircle_edge_54.png");
-  squircle_glow = load_texture(PKGDATADIR"/squircle_glow_62.png");
-  squircle_shadow = load_texture(PKGDATADIR"/squircle_shadow_62.png");
-  squircle_shine = load_texture(PKGDATADIR"/squircle_shine_54.png");
+  // squircle_base = load_texture(PKGDATADIR"/squircle_base_54.png");
+  // squircle_base_selected = load_texture(PKGDATADIR"/squircle_base_selected_54.png");
+  // squircle_edge = load_texture(PKGDATADIR"/squircle_edge_54.png");
+  // squircle_glow = load_texture(PKGDATADIR"/squircle_glow_62.png");
+  // squircle_shadow = load_texture(PKGDATADIR"/squircle_shadow_62.png");
+  // squircle_shine = load_texture(PKGDATADIR"/squircle_shine_54.png");
 
   pip_ltr = load_texture(PKGDATADIR"/launcher_pip_ltr.png");
   arrow_ltr = load_texture(PKGDATADIR"/launcher_arrow_ltr.png");
@@ -1274,12 +1268,12 @@
   destroy_textures(icon_shadow);
   destroy_textures(icon_shine);
 
-  squircle_base->UnReference();
-  squircle_base_selected->UnReference();
-  squircle_edge->UnReference();
-  squircle_glow->UnReference();
-  squircle_shadow->UnReference();
-  squircle_shine->UnReference();
+  // squircle_base->UnReference();
+  // squircle_base_selected->UnReference();
+  // squircle_edge->UnReference();
+  // squircle_glow->UnReference();
+  // squircle_shadow->UnReference();
+  // squircle_shine->UnReference();
 
   IconRenderer::DestroyShortcutTextures();