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

[Andrea Azzarone]

Use the same padding for the minimum width and height of hud::Icon.

== Problem ==
[regression] Hideous low-res icon when using the HUD with autohide enabled.

== Fix ==
Use the same padding for SetMinimumWidth and SetMinimumHeight.

== Screenshots ==
Before fix: https://bugs.launchpad.net/unity/+bug/1035951/+attachment/3268880/+files/Screenshot%20from%202012-08-20%2016%3A33%3A42.png

After fix: https://bugs.launchpad.net/unity/+bug/1035951/+attachment/3268881/+files/Screenshot%20from%202012-08-20%2016%3A28%3A37.png

[Brandon Schaefer (brandontschaefer)]

Confirm fixes problem and looks good. +1

review: Approve

=== modified file 'hud/HudIcon.cpp'
--- hud/HudIcon.cpp	2012-05-07 00:49:31 +0000
+++ hud/HudIcon.cpp	2012-08-20 14:33:33 +0000
@@ -24,8 +24,7 @@
 
 namespace
 {
-  nux::logging::Logger logger("unity.hud.icon");
-  const unsigned int vertical_padding = 4;
+nux::logging::Logger logger("unity.hud.icon");
 }
 
 namespace unity
@@ -36,10 +35,6 @@
 Icon::Icon()
   : IconTexture("", 0, true)
 {
-  background_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/launcher_icon_back_54.png", -1, true));
-  gloss_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/launcher_icon_shine_54.png", -1, true));
-  edge_.Adopt(nux::CreateTexture2DFromFile(PKGDATADIR"/launcher_icon_edge_54.png", -1,  true));
-
   texture_updated.connect([&] (nux::BaseTexture* texture)
   {
     icon_texture_source_ = new HudIconTextureSource(nux::ObjectPtr<nux::BaseTexture>(texture));
@@ -49,12 +44,13 @@
   });
 }
 
-void Icon::SetIcon(std::string const& icon_name, unsigned int icon_size, unsigned int tile_size)
+void Icon::SetIcon(std::string const& icon_name, unsigned int icon_size, unsigned int tile_size, unsigned int padding)
 {
   IconTexture::SetByIconName(icon_name, icon_size);
   icon_renderer_.SetTargetSize(tile_size, icon_size, 0);
-  SetMinimumWidth(tile_size);
-  SetMinimumHeight(tile_size + vertical_padding * 2);
+
+  SetMinimumHeight(tile_size + padding);
+  SetMinimumWidth(tile_size + padding);
 }
 
 void Icon::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -76,7 +72,6 @@
   std::list<unity::ui::RenderArg> args;
   args.push_front(arg);
 
-
   auto toplevel = GetToplevel();
   icon_renderer_.PreprocessIcons(args, toplevel->GetGeometry());
   icon_renderer_.RenderIcon(GfxContext, arg, toplevel->GetGeometry(), toplevel->GetGeometry());

=== modified file 'hud/HudIcon.h'
--- hud/HudIcon.h	2012-05-07 00:49:31 +0000
+++ hud/HudIcon.h	2012-08-20 14:33:33 +0000
@@ -37,7 +37,7 @@
   typedef nux::ObjectPtr<Icon> Ptr;
   Icon();
 
-  void SetIcon(std::string const& icon_name, unsigned int icon_size, unsigned int tile_size);
+  void SetIcon(std::string const& icon_name, unsigned int icon_size, unsigned int tile_size, unsigned int padding);
 
 protected:
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
@@ -45,9 +45,6 @@
   std::string GetName() const;
 
 private:
-  nux::ObjectPtr<nux::BaseTexture> background_;
-  nux::ObjectPtr<nux::BaseTexture> gloss_;
-  nux::ObjectPtr<nux::BaseTexture> edge_;
   nux::ObjectPtr<HudIconTextureSource> icon_texture_source_;
   unity::ui::IconRenderer icon_renderer_;
 };

=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2012-07-10 03:27:49 +0000
+++ hud/HudView.cpp	2012-08-20 14:33:33 +0000
@@ -281,8 +281,7 @@
 
   LOG_DEBUG(logger) << "Setting icon to " << icon_name;
 
-  icon_->SetIcon(icon_name, size, tile_size);
-  icon_->SetMinimumWidth(tile_size + padding);
+  icon_->SetIcon(icon_name, size, tile_size, padding);
 
   /* We need to compute this value manually, since the _content_layout height changes */
   int content_height = search_bar_->GetBaseHeight() + top_padding + bottom_padding;