Merge lp:~3v1n0/unity/hud-dynamic-icon-size into lp:unity

[Marco Trevisan (Treviño)]

Hud: update the icon size to match the launcher icon size when in auto-hide mode

Plus prevent a couple of crashes

When the launcher is in autohide mode the HUD should update the icon size to follow the launcher icon size.

To do that, now unityshell updates two HudController properties that controls the icon size and the tile size, then we update the HudIcon values accordingly. The HUD icon is now using also a padding that, in case of big icon sizes, makes the HUD to increase its size, keeping the icon far from its borders.

Also I've prevented a couple of crashes in IconTexture and HudView.

Since this is a pure visual change, no testing is needed. Here the fixes:

Hud 48px (standard) icon: http://i.imgur.com/tNoWc.png
Hud 64px icon: http://i.imgur.com/ks3OH.png
Hud 32px icon: http://i.imgur.com/IAIgk.png

[Tim Penhey (thumper)]

code looks good.

review: Approve

[Andrea Cimitan (cimi)]

Screenshots are fine

=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-04-19 03:43:22 +0000
+++ plugins/unityshell/src/HudController.cpp	2012-04-23 02:07:20 +0000
@@ -170,6 +170,16 @@
   }
 }
 
+void Controller::SetIcon(std::string const& icon_name)
+{
+  LOG_DEBUG(logger) << "setting icon to - " << icon_name;
+
+  if (view_)
+    view_->SetIcon(icon_name, tile_size, icon_size, launcher_width - tile_size);
+
+  ubus.SendMessage(UBUS_HUD_ICON_CHANGED, g_variant_new_string(icon_name.c_str()));
+}
+
 nux::BaseWindow* Controller::window() const
 {
   return window_;
@@ -300,7 +310,7 @@
   {
     // Windows list stack for all the monitors
     GList *windows = bamf_matcher_get_window_stack_for_monitor(matcher, -1);
-    
+
     // Reset values, in case we can't find a window ie. empty current desktop
     active_xid = 0;
     active_win = nullptr;
@@ -326,6 +336,7 @@
 
     g_list_free(windows);
   }
+
   BamfApplication* active_app = bamf_matcher_get_application_for_window(matcher, active_win);
 
   if (BAMF_IS_VIEW(active_app))
@@ -340,8 +351,7 @@
   }
 
   LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
-  ubus.SendMessage(UBUS_HUD_ICON_CHANGED, g_variant_new_string(focused_app_icon_.c_str())); 
-  view_->SetIcon(focused_app_icon_);
+  SetIcon(focused_app_icon_);
 
   window_->ShowWindow(true);
   window_->PushToFront();
@@ -493,8 +503,7 @@
 void Controller::OnQuerySelected(Query::Ptr query)
 {
   LOG_DEBUG(logger) << "Selected query, " << query->formatted_text;
-  view_->SetIcon(query->icon_name);
-  ubus.SendMessage(UBUS_HUD_ICON_CHANGED, g_variant_new_string(query->icon_name.c_str()));
+  SetIcon(query->icon_name);
 }
 
 void Controller::OnQueriesFinished(Hud::Queries queries)
@@ -510,9 +519,7 @@
     }
   }
 
-  LOG_DEBUG(logger) << "setting icon to - " << icon_name;
-  view_->SetIcon(icon_name);
-  ubus.SendMessage(UBUS_HUD_ICON_CHANGED, g_variant_new_string(icon_name.c_str()));
+  SetIcon(icon_name);
 }
 
 // Introspectable
 
=== modified file 'plugins/unityshell/src/HudController.h'
--- plugins/unityshell/src/HudController.h	2012-04-02 00:16:21 +0000
+++ plugins/unityshell/src/HudController.h	2012-04-23 02:07:20 +0000
@@ -48,6 +48,8 @@
   nux::BaseWindow* window() const;
 
   nux::Property<int> launcher_width;
+  nux::Property<int> icon_size;
+  nux::Property<int> tile_size;
   nux::Property<bool> launcher_locked_out;
   nux::Property<bool> multiple_launchers;
 
@@ -65,6 +67,7 @@
   void SetupWindow();
   void SetupHudView();
   void RegisterUBusInterests();
+  void SetIcon(std::string const& icon_name);
 
   int GetTargetMonitor();
   bool IsLockedToLauncher(int monitor);
 
=== modified file 'plugins/unityshell/src/HudIcon.cpp'
--- plugins/unityshell/src/HudIcon.cpp	2012-04-03 11:44:41 +0000
+++ plugins/unityshell/src/HudIcon.cpp	2012-04-23 02:07:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Gord Allott <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
  */
 
 
@@ -24,8 +25,7 @@
 namespace
 {
   nux::logging::Logger logger("unity.hud.icon");
-  const unsigned int tile_margin = 4;
-  const unsigned int minimum_width = 64;
+  const unsigned int vertical_padding = 4;
 }
 
 namespace unity
@@ -33,13 +33,9 @@
 namespace hud
 {
 
-Icon::Icon(std::string const& icon_name, unsigned int size)
-  : IconTexture(icon_name, size, true)
+Icon::Icon()
+  : IconTexture("", 0, true)
 {
-  int tile_size = size + tile_margin * 2;
-  SetMinimumWidth(minimum_width);
-  SetMinimumHeight(tile_size);
-  icon_renderer_.SetTargetSize(tile_size, size, 0);
   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));
@@ -53,6 +49,14 @@
   });
 }
 
+void Icon::SetIcon(std::string const& icon_name, unsigned int icon_size, unsigned int tile_size)
+{
+  IconTexture::SetByIconName(icon_name, icon_size);
+  icon_renderer_.SetTargetSize(tile_size, icon_size, 0);
+  SetMinimumWidth(tile_size);
+  SetMinimumHeight(tile_size + vertical_padding * 2);
+}
+
 void Icon::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
 {
   if (texture() == nullptr)
@@ -63,8 +67,8 @@
   arg.colorify            = nux::color::White;
   arg.running_arrow       = true;
   arg.running_on_viewport = true;
-  arg.render_center       = nux::Point3(32, 32, 0);
-  arg.logical_center      = nux::Point3(52, 50, 0);
+  arg.render_center       = nux::Point3(GetMinimumWidth() / 2.0f, GetMinimumHeight() / 2.0f, 0.0f);
+  arg.logical_center      = arg.render_center;
   arg.window_indicators   = true;
   arg.backlight_intensity = 1.0f;
   arg.alpha               = 1.0f;
 
=== modified file 'plugins/unityshell/src/HudIcon.h'
--- plugins/unityshell/src/HudIcon.h	2012-04-01 00:00:45 +0000
+++ plugins/unityshell/src/HudIcon.h	2012-04-23 02:07:20 +0000
@@ -34,8 +34,10 @@
 class Icon : public unity::IconTexture
 {
 public:
-  typedef nux::ObjectPtr<IconTexture> Ptr;
-  Icon(std::string const& icon_name, unsigned int size);
+  typedef nux::ObjectPtr<Icon> Ptr;
+  Icon();
+
+  void SetIcon(std::string const& icon_name, unsigned int icon_size, unsigned int tile_size);
 
 protected:
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-04-11 14:57:40 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-04-23 02:07:20 +0000
@@ -39,11 +39,10 @@
 namespace
 {
 nux::logging::Logger logger("unity.hud.view");
-const int icon_size = 46;
 const int grow_anim_length = 90 * 1000;
 const int pause_before_grow_length = 32 * 1000;
 
-const int default_width = 1024;
+const int default_width = 960;
 const int default_height = 276;
 const int content_width = 941;
 
@@ -126,6 +125,9 @@
   {
     RemoveChild((*button).GetPointer());
   }
+
+  if (timeline_id_)
+    g_source_remove(timeline_id_);
 }
 
 void View::ProcessGrowShrink()
@@ -175,7 +177,7 @@
 
 void View::Relayout()
 {
-  nux::Geometry geo = GetGeometry();
+  nux::Geometry const& geo = GetGeometry();
   content_geo_ = GetBestFitGeometry(geo);
   LOG_DEBUG(logger) << "content_geo: " << content_geo_.width << "x" << content_geo_.height;
 
@@ -267,10 +269,20 @@
   QueueDraw();
 }
 
-void View::SetIcon(std::string icon_name)
+void View::SetIcon(std::string icon_name, unsigned int tile_size, unsigned int size, unsigned int padding)
 {
+  if (!icon_)
+    return;
+
   LOG_DEBUG(logger) << "Setting icon to " << icon_name;
-  icon_->SetByIconName(icon_name, icon_size);
+
+  icon_->SetIcon(icon_name, size, tile_size);
+  icon_->SetMinimumWidth(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;
+  icon_->SetMinimumHeight(std::max(icon_->GetMinimumHeight(), content_height));
+
   QueueDraw();
 }
 
@@ -307,10 +319,8 @@
   int width = default_width;
   int height = default_height;
 
-  if (!show_embedded_icon_)
-  {
-    width -= icon_->GetGeometry().width;
-  }
+  if (show_embedded_icon_)
+    width += icon_->GetGeometry().width;
 
   LOG_DEBUG (logger) << "best fit is, " << width << ", " << height;
 
@@ -343,7 +353,7 @@
   layout_ = new nux::HLayout();
   {
     // fill layout with icon
-    icon_ = new Icon("", icon_size);
+    icon_ = new Icon();
     {
       AddChild(icon_.GetPointer());
       layout_->AddView(icon_.GetPointer(), 0, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL);
@@ -457,7 +467,7 @@
 
   if (timeline_need_more_draw_ && !timeline_id_)
   {
-    timeline_id_ = g_timeout_add(0, [] (gpointer data) -> gboolean
+    timeline_id_ = g_idle_add([] (gpointer data) -> gboolean
     {
       View *self = static_cast<View*>(data);
       self->QueueDraw();
 
=== modified file 'plugins/unityshell/src/HudView.h'
--- plugins/unityshell/src/HudView.h	2012-04-02 16:06:18 +0000
+++ plugins/unityshell/src/HudView.h	2012-04-23 02:07:20 +0000
@@ -53,7 +53,7 @@
   nux::View* default_focus() const;
 
   void SetQueries(Hud::Queries queries);
-  void SetIcon(std::string icon_name);
+  void SetIcon(std::string icon_name, unsigned int tile_size, unsigned int size, unsigned int padding);
   void ShowEmbeddedIcon(bool show);
 
   void AboutToShow();
@@ -123,4 +123,3 @@
 }
 }
 #endif
-
 
=== modified file 'plugins/unityshell/src/IconTexture.cpp'
--- plugins/unityshell/src/IconTexture.cpp	2012-04-11 01:08:15 +0000
+++ plugins/unityshell/src/IconTexture.cpp	2012-04-23 02:07:20 +0000
@@ -46,6 +46,7 @@
 IconTexture::IconTexture(nux::BaseTexture* texture, guint width, guint height)
   : TextureArea(NUX_TRACKER_LOCATION),
     _accept_key_nav_focus(false),
+    _pixbuf_cached(nullptr),
     _size(height),
     _texture_cached(texture),
     _texture_width(width),
@@ -60,6 +61,7 @@
 IconTexture::IconTexture(std::string const& icon_name, unsigned int size, bool defer_icon_loading)
   : TextureArea(NUX_TRACKER_LOCATION),
     _accept_key_nav_focus(false),
+    _pixbuf_cached(nullptr),
     _icon_name(!icon_name.empty() ? icon_name : DEFAULT_ICON),
     _size(size),
     _texture_width(0),
@@ -167,6 +169,7 @@
   }
   else
   {
+    _pixbuf_cached = nullptr;
     _loading = false;
 
     // Protects against a missing default icon, we only request it if icon_name
 
=== modified file 'plugins/unityshell/src/IconTexture.h'
--- plugins/unityshell/src/IconTexture.h	2012-04-11 00:57:41 +0000
+++ plugins/unityshell/src/IconTexture.h	2012-04-23 02:07:20 +0000
@@ -63,7 +63,7 @@
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
   virtual bool DoCanFocus();
-  GdkPixbuf*        _pixbuf_cached;
+  GdkPixbuf* _pixbuf_cached;
 
 protected:
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-04-21 21:32:26 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-04-23 02:07:20 +0000
@@ -2643,9 +2643,12 @@
       launcher_options->icon_size = optionGetIconSize();
       launcher_options->tile_size = optionGetIconSize() + 6;
 
+      hud_controller_->icon_size = launcher_options->icon_size();
+      hud_controller_->tile_size = launcher_options->tile_size();
+
+      /* The launcher geometry includes 1px used to draw the right margin
+       * that must not be considered when drawing an overlay */
       hud_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
-      /* The launcher geometry includes 1px used to draw the right margin
-       * that must not be considered when drawing the dash                    */
       dash_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1;
 
       if (p)
@@ -2838,6 +2841,8 @@
   auto hide_mode = (unity::launcher::LauncherHideMode) optionGetLauncherHideMode();
   hud_controller_->launcher_locked_out = (hide_mode == unity::launcher::LauncherHideMode::LAUNCHER_HIDE_NEVER);
   hud_controller_->multiple_launchers = (optionGetNumLaunchers() == 0);
+  hud_controller_->icon_size = launcher_controller_->options()->icon_size();
+  hud_controller_->tile_size = launcher_controller_->options()->tile_size();
   AddChild(hud_controller_.get());
   LOG_INFO(logger) << "initLauncher-hud " << timer.ElapsedSeconds() << "s";