Merge lp:~3v1n0/unity/icons-emblem-scaling into lp:unity

[Marco Trevisan (Treviño)]

IconRenderer: draw count texture at proper scaling, built by LauncherIcon

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3852
http://jenkins.qa.ubuntu.com/job/unity-ci/1054/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/141

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1054/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3853
http://jenkins.qa.ubuntu.com/job/unity-ci/1055/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/142/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/142
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/142/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1055/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Looks pretty good. Just to note as discussed, when scaling down < 1, the text can become hard to read depending on the scaling factor, but there is not much that can be done to make it better.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3855
http://jenkins.qa.ubuntu.com/job/unity-ci/1056/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/143/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1056/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3855
http://jenkins.qa.ubuntu.com/job/unity-ci/1058/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/145
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/145/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/145

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1058/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3855
http://jenkins.qa.ubuntu.com/job/unity-ci/1060/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/147
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/147

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1060/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3855
http://jenkins.qa.ubuntu.com/job/unity-ci/1065/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/152/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/152

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1065/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3855
http://jenkins.qa.ubuntu.com/job/unity-ci/1066/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/153

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1066/rebuild

review: Approve (continuous-integration)

=== modified file 'hud/HudIconTextureSource.cpp'
--- hud/HudIconTextureSource.cpp	2012-10-29 09:34:54 +0000
+++ hud/HudIconTextureSource.cpp	2014-08-08 15:13:47 +0000
@@ -109,11 +109,6 @@
  return nux::Color(0.0f, 0.0f, 0.0f, 0.0f); 
 }
 
-nux::BaseTexture* HudIconTextureSource::Emblem()
-{
-  return nullptr;
-}
-
 }
 }
 
 
=== modified file 'hud/HudIconTextureSource.h'
--- hud/HudIconTextureSource.h	2013-11-06 11:21:43 +0000
+++ hud/HudIconTextureSource.h	2014-08-08 15:13:47 +0000
@@ -37,7 +37,6 @@
   virtual nux::Color BackgroundColor() const;
   virtual nux::BaseTexture* TextureForSize(int size);
   virtual nux::Color GlowColor();
-  virtual nux::BaseTexture* Emblem();
   void ColorForIcon(GdkPixbuf* pixbuf);
   
 private:
 
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2014-07-17 18:33:37 +0000
+++ launcher/Launcher.cpp	2014-08-08 15:13:47 +0000
@@ -1219,6 +1219,7 @@
   Resize(nux::Point(monitor_geo.x, monitor_geo.y + panel_height), monitor_geo.height - panel_height);
 
   icon_renderer_->monitor = new_monitor;
+  icon_renderer_->scale = cv_->DPIScale();
   SetIconSize(options()->tile_size, options()->icon_size);
 }
 
@@ -1519,7 +1520,6 @@
   ui::IconRenderer::DestroyShortcutTextures();
 
   icon_size_ = tile_size;
-  icon_renderer_->scale = cv_->DPIScale();
   icon_renderer_->SetTargetSize(icon_size_.CP(cv_), RawPixel(icon_size).CP(cv_), SPACE_BETWEEN_ICONS.CP(cv_));
   AbstractLauncherIcon::icon_size = icon_size_;
 
 
=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2014-05-28 12:14:44 +0000
+++ launcher/LauncherIcon.cpp	2014-08-08 15:13:47 +0000
@@ -59,6 +59,11 @@
 const std::string CENTER_STABILIZE_TIMEOUT = "center-stabilize-timeout";
 const std::string PRESENT_TIMEOUT = "present-timeout";
 const std::string QUIRK_DELAY_TIMEOUT = "quirk-delay-timeout";
+
+const int COUNT_WIDTH = 32;
+const int COUNT_HEIGHT = 16;
+const int COUNT_FONT_WIDTH = COUNT_WIDTH - 4;
+const int COUNT_FONT_HEIGHT = COUNT_HEIGHT - 5;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(LauncherIcon);
@@ -69,7 +74,6 @@
 LauncherIcon::LauncherIcon(IconType type)
   : _icon_type(type)
   , _sticky(false)
-  , _remote_urgent(false)
   , _present_urgency(0)
   , _progress(0.0f)
   , _sort_priority(DefaultPriority(type))
@@ -99,6 +103,8 @@
   mouse_down.connect(sigc::mem_fun(this, &LauncherIcon::RecvMouseDown));
   mouse_up.connect(sigc::mem_fun(this, &LauncherIcon::RecvMouseUp));
   mouse_click.connect(sigc::mem_fun(this, &LauncherIcon::RecvMouseClick));
+  Settings::Instance().dpi_changed.connect(sigc::mem_fun(this, &LauncherIcon::CleanCountTextures));
+  icon_size.changed.connect(sigc::hide(sigc::mem_fun(this, &LauncherIcon::CleanCountTextures)));
 
   for (unsigned i = 0; i < monitors::MAX; ++i)
   {
@@ -966,14 +972,42 @@
   return result;
 }
 
-nux::BaseTexture*
-LauncherIcon::Emblem()
+nux::BaseTexture* LauncherIcon::Emblem() const
 {
   return _emblem.GetPointer();
 }
 
-void
-LauncherIcon::SetEmblem(LauncherIcon::BaseTexturePtr const& emblem)
+nux::BaseTexture* LauncherIcon::CountTexture(double scale)
+{
+  int count = Count();
+
+  if (!count)
+    return nullptr;
+
+  auto it = _counts.find(scale);
+
+  if (it != _counts.end())
+    return it->second.GetPointer();
+
+  auto const& texture = DrawCountTexture(count, scale);
+  _counts[scale] = texture;
+  return texture.GetPointer();
+}
+
+unsigned LauncherIcon::Count() const
+{
+  if (!_remote_entries.empty())
+  {
+    auto const& remote = _remote_entries.front();
+
+    if (remote->CountVisible())
+      return remote->Count();
+  }
+
+  return 0;
+}
+
+void LauncherIcon::SetEmblem(LauncherIcon::BaseTexturePtr const& emblem)
 {
   _emblem = emblem;
   EmitNeedsRedraw();
@@ -994,60 +1028,44 @@
   emblem->UnReference();
 }
 
-void
-LauncherIcon::SetEmblemText(std::string const& text)
-{
-  PangoLayout*          layout     = NULL;
-
-  PangoContext*         pangoCtx   = NULL;
-  PangoFontDescription* desc       = NULL;
-  GdkScreen*            screen     = gdk_screen_get_default();    // not ref'ed
-  GtkSettings*          settings   = gtk_settings_get_default();  // not ref'ed
-  gchar*                fontName   = NULL;
-
-  int width = 32;
-  int height = 8 * 2;
-  int font_height = height - 5;
-
-
-  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, width, height);
-  cairo_t* cr = cg.GetInternalContext();
-
-  cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
-  cairo_paint(cr);
-
-  cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-
-
-  layout = pango_cairo_create_layout(cr);
-
-  g_object_get(settings, "gtk-font-name", &fontName, NULL);
-  desc = pango_font_description_from_string(fontName);
-  pango_font_description_set_absolute_size(desc, pango_units_from_double(font_height));
-
-  pango_layout_set_font_description(layout, desc);
-  pango_font_description_free(desc);
-
-  pango_layout_set_width(layout, pango_units_from_double(width - 4.0f));
+void LauncherIcon::CleanCountTextures()
+{
+  _counts.clear();
+}
+
+BaseTexturePtr LauncherIcon::DrawCountTexture(unsigned count, double scale)
+{
+  auto const& count_text = (count / 10000 != 0) ? "****" : std::to_string(count);
+
+  glib::Object<PangoContext> pango_ctx(gdk_pango_context_get());
+  glib::Object<PangoLayout> layout(pango_layout_new(pango_ctx));
+
+  glib::String font_name;
+  g_object_get(gtk_settings_get_default(), "gtk-font-name", &font_name, nullptr);
+  std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font_name), pango_font_description_free);
+  pango_font_description_set_absolute_size(desc.get(), pango_units_from_double(COUNT_FONT_HEIGHT));
+  pango_layout_set_font_description(layout, desc.get());
+
+  pango_layout_set_width(layout, pango_units_from_double(COUNT_FONT_WIDTH));
   pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
   pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
-  pango_layout_set_markup_with_accel(layout, text.c_str(), -1, '_', NULL);
-
-  pangoCtx = pango_layout_get_context(layout);  // is not ref'ed
-  pango_cairo_context_set_font_options(pangoCtx,
-                                       gdk_screen_get_font_options(screen));
-
-  PangoRectangle logical_rect, ink_rect;
-  pango_layout_get_extents(layout, &logical_rect, &ink_rect);
+  pango_layout_set_markup_with_accel(layout, count_text.c_str(), -1, '_', nullptr);
+
+  PangoRectangle ink_rect;
+  pango_layout_get_pixel_extents(layout, &ink_rect, nullptr);
 
   /* DRAW OUTLINE */
-  float radius = height / 2.0f - 1.0f;
+  float radius = COUNT_HEIGHT / 2.0f - 1.0f;
   float inset = radius + 1.0f;
 
-  cairo_move_to(cr, inset, height - 1.0f);
+  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, std::round(COUNT_WIDTH * scale), std::round(COUNT_HEIGHT * scale));
+  cairo_surface_set_device_scale(cg.GetSurface(), scale, scale);
+  cairo_t* cr = cg.GetInternalContext();
+
+  cairo_move_to(cr, inset, COUNT_HEIGHT - 1.0f);
   cairo_arc(cr, inset, inset, radius, 0.5 * M_PI, 1.5 * M_PI);
-  cairo_arc(cr, width - inset, inset, radius, 1.5 * M_PI, 0.5 * M_PI);
-  cairo_line_to(cr, inset, height - 1.0f);
+  cairo_arc(cr, COUNT_WIDTH - inset, inset, radius, 1.5 * M_PI, 0.5 * M_PI);
+  cairo_line_to(cr, inset, COUNT_HEIGHT - 1.0f);
 
   cairo_set_source_rgba(cr, 0.35f, 0.35f, 0.35f, 1.0f);
   cairo_fill_preserve(cr);
@@ -1059,16 +1077,11 @@
   cairo_set_line_width(cr, 1.0f);
 
   /* DRAW TEXT */
-  cairo_move_to(cr,
-                (int)((width - pango_units_to_double(logical_rect.width)) / 2.0f),
-                (int)((height - pango_units_to_double(logical_rect.height)) / 2.0f - pango_units_to_double(logical_rect.y)));
+  cairo_move_to(cr, (COUNT_WIDTH - ink_rect.width) / 2.0 - ink_rect.x,
+                    (COUNT_HEIGHT - ink_rect.height) / 2.0 - ink_rect.y);
   pango_cairo_show_layout(cr, layout);
 
-  SetEmblem(texture_ptr_from_cairo_graphics(cg));
-
-  // clean up
-  g_object_unref(layout);
-  g_free(fontName);
+  return texture_ptr_from_cairo_graphics(cg);
 }
 
 void
@@ -1077,26 +1090,34 @@
   SetEmblem(BaseTexturePtr());
 }
 
-void
-LauncherIcon::InsertEntryRemote(LauncherEntryRemote::Ptr const& remote)
+void LauncherIcon::InsertEntryRemote(LauncherEntryRemote::Ptr const& remote)
 {
-  if (std::find(_entry_list.begin(), _entry_list.end(), remote) != _entry_list.end())
+  if (!remote || std::find(_remote_entries.begin(), _remote_entries.end(), remote) != _remote_entries.end())
     return;
 
-  _entry_list.push_front(remote);
+  _remote_entries.push_back(remote);
   AddChild(remote.get());
-
-  remote->emblem_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteEmblemChanged));
-  remote->count_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteCountChanged));
-  remote->progress_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteProgressChanged));
-  remote->quicklist_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteQuicklistChanged));
-
-  remote->emblem_visible_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteEmblemVisibleChanged));
-  remote->count_visible_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteCountVisibleChanged));
-  remote->progress_visible_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteProgressVisibleChanged));
-
-  remote->urgent_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteUrgentChanged));
-
+  SelectEntryRemote(remote);
+}
+
+void LauncherIcon::SelectEntryRemote(LauncherEntryRemote::Ptr const& remote)
+{
+  if (!remote)
+    return;
+
+  auto& cm = _remote_connections;
+  cm.Clear();
+
+  cm.Add(remote->emblem_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteEmblemChanged)));
+  cm.Add(remote->count_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteCountChanged)));
+  cm.Add(remote->progress_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteProgressChanged)));
+  cm.Add(remote->quicklist_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteQuicklistChanged)));
+
+  cm.Add(remote->emblem_visible_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteEmblemVisibleChanged)));
+  cm.Add(remote->count_visible_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteCountVisibleChanged)));
+  cm.Add(remote->progress_visible_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteProgressVisibleChanged)));
+
+  cm.Add(remote->urgent_changed.connect(sigc::mem_fun(this, &LauncherIcon::OnRemoteUrgentChanged)));
 
   if (remote->EmblemVisible())
     OnRemoteEmblemVisibleChanged(remote.get());
@@ -1113,28 +1134,30 @@
   OnRemoteQuicklistChanged(remote.get());
 }
 
-void
-LauncherIcon::RemoveEntryRemote(LauncherEntryRemote::Ptr const& remote)
+void LauncherIcon::RemoveEntryRemote(LauncherEntryRemote::Ptr const& remote)
 {
-  if (std::find(_entry_list.begin(), _entry_list.end(), remote) == _entry_list.end())
+  auto remote_it = std::find(_remote_entries.begin(), _remote_entries.end(), remote);
+
+  if (remote_it == _remote_entries.end())
     return;
 
-  _entry_list.remove(remote);
+  SetQuirk(Quirk::PROGRESS, false);
+
+  if (remote->Urgent())
+    SetQuirk(Quirk::URGENT, false);
+
+  _remote_entries.erase(remote_it);
   RemoveChild(remote.get());
-
   DeleteEmblem();
-  SetQuirk(Quirk::PROGRESS, false);
-
-  if (_remote_urgent)
-    SetQuirk(Quirk::URGENT, false);
-
   _remote_menus = nullptr;
+
+  if (!_remote_entries.empty())
+    SelectEntryRemote(_remote_entries.back());
 }
 
 void
 LauncherIcon::OnRemoteUrgentChanged(LauncherEntryRemote* remote)
 {
-  _remote_urgent = remote->Urgent();
   SetQuirk(Quirk::URGENT, remote->Urgent());
 }
 
@@ -1153,14 +1176,8 @@
   if (!remote->CountVisible())
     return;
 
-  if (remote->Count() / 10000 != 0)
-  {
-    SetEmblemText("****");
-  }
-  else
-  {
-    SetEmblemText(std::to_string(remote->Count()));
-  }
+  CleanCountTextures();
+  EmitNeedsRedraw();
 }
 
 void
@@ -1190,14 +1207,8 @@
 void
 LauncherIcon::OnRemoteCountVisibleChanged(LauncherEntryRemote* remote)
 {
-  if (remote->CountVisible())
-  {
-    SetEmblemText(std::to_string(remote->Count()));
-  }
-  else
-  {
-    DeleteEmblem();
-  }
+  CleanCountTextures();
+  EmitNeedsRedraw();
 }
 
 void
 
=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2014-05-28 09:56:00 +0000
+++ launcher/LauncherIcon.h	2014-08-08 15:13:47 +0000
@@ -154,14 +154,15 @@
   }
 
   nux::BaseTexture* TextureForSize(int size);
-
-  nux::BaseTexture* Emblem();
+  nux::BaseTexture* Emblem() const override;
+  nux::BaseTexture* CountTexture(double scale) override;
 
   MenuItemsVector Menus();
-
-  void InsertEntryRemote(LauncherEntryRemote::Ptr const& remote);
-
-  void RemoveEntryRemote(LauncherEntryRemote::Ptr const& remote);
+  unsigned Count() const;
+
+  void InsertEntryRemote(LauncherEntryRemote::Ptr const&);
+  void SelectEntryRemote(LauncherEntryRemote::Ptr const&);
+  void RemoveEntryRemote(LauncherEntryRemote::Ptr const&);
 
   nux::DndAction QueryAcceptDrop(DndData const& dnd_data)
   {
@@ -323,9 +324,10 @@
   void LoadQuicklist();
 
   void OnTooltipEnabledChanged(bool value);
+  void CleanCountTextures();
+  BaseTexturePtr DrawCountTexture(unsigned count, double scale);
 
   bool _sticky;
-  bool _remote_urgent;
   float _present_urgency;
   float _progress;
   int _sort_priority;
@@ -346,8 +348,10 @@
   time::Spec _last_action;
 
   BaseTexturePtr _emblem;
+  std::unordered_map<double, BaseTexturePtr> _counts;
 
-  std::list<LauncherEntryRemote::Ptr> _entry_list;
+  std::vector<LauncherEntryRemote::Ptr> _remote_entries;
+  connection::Manager _remote_connections;
   glib::Object<DbusmenuClient> _remote_menus;
 
   static glib::Object<GtkIconTheme> _unity_theme;
 
=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2013-12-11 15:03:25 +0000
+++ launcher/MockLauncherIcon.h	2014-08-08 15:13:47 +0000
@@ -329,11 +329,6 @@
     return icon_;
   }
 
-  nux::BaseTexture* Emblem()
-  {
-    return 0;
-  }
-
   MenuItemsVector Menus()
   {
     return MenuItemsVector ();
 
=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2014-07-15 16:28:45 +0000
+++ launcher/SwitcherView.cpp	2014-08-08 15:13:47 +0000
@@ -76,6 +76,7 @@
   icon_renderer_->pip_style = OVER_TILE;
   icon_renderer_->monitor = monitors::MAX;
   icon_renderer_->SetTargetSize(tile_size, icon_size, minimum_spacing);
+  icon_renderer_->scale = scale();
 
   text_view_->SetMaximumWidth(tile_size * TEXT_TILE_MULTIPLIER);
   text_view_->SetLines(1);
@@ -196,6 +197,7 @@
   tile_size = TILE_SIZE.CP(scale);
   text_size = TEXT_SIZE.CP(scale);
   vertical_size = tile_size + VERTICAL_PADDING.CP(scale) * 2;
+  icon_renderer_->scale = scale;
 }
 
 void SwitcherView::StartAnimation()
 
=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2014-05-30 07:20:13 +0000
+++ panel/PanelIndicatorEntryView.cpp	2014-08-08 15:13:47 +0000
@@ -426,7 +426,7 @@
       }
     }
 
-    glib::Object<PangoContext> context(gdk_pango_context_get_for_screen(gdk_screen_get_default()));
+    glib::Object<PangoContext> context(gdk_pango_context_get());
     std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font.c_str()), pango_font_description_free);
     pango_context_set_font_description(context, desc.get());
     pango_context_set_language(context, gtk_get_default_language());
 
=== modified file 'unity-shared/DecorationStyle.cpp'
--- unity-shared/DecorationStyle.cpp	2014-06-13 15:22:15 +0000
+++ unity-shared/DecorationStyle.cpp	2014-08-08 15:13:47 +0000
@@ -147,8 +147,8 @@
     , ctx_(gtk_style_context_new())
     , settings_(g_settings_new(SETTINGS_NAME.c_str()))
     , usettings_(g_settings_new(UNITY_SETTINGS_NAME.c_str()))
-    , title_pango_ctx_(gdk_pango_context_get_for_screen(gdk_screen_get_default()))
-    , menu_item_pango_ctx_(gdk_pango_context_get_for_screen(gdk_screen_get_default()))
+    , title_pango_ctx_(gdk_pango_context_get())
+    , menu_item_pango_ctx_(gdk_pango_context_get())
     , title_alignment_(0)
     , title_indent_(0)
     , title_fade_(0)
 
=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2014-05-08 18:52:16 +0000
+++ unity-shared/IconRenderer.cpp	2014-08-08 15:13:47 +0000
@@ -199,6 +199,8 @@
 const std::array<int, IconSize::SIZE> TILE_SIZES = { 54, 150 };
 const std::array<int, IconSize::SIZE> GLOW_SIZES = { 62, 200 };
 const std::array<int, IconSize::SIZE> MARKER_SIZES = { 19, 37 };
+
+constexpr double count_scaling(double icon_size, bool switcher) { return icon_size / (TILE_SIZES[local::IconSize::SMALL] * (switcher ? 2.0 : 1.0)); }
 } // anonymous namespace
 } // local namespace
 
@@ -352,6 +354,7 @@
   GetInverseScreenPerspectiveMatrix(ViewMatrix, ProjectionMatrix, geo.width, geo.height, 0.1f, 1000.0f, DEGTORAD(90));
 
   nux::Matrix4 const& PremultMatrix = ProjectionMatrix * ViewMatrix;
+  int monitor = this->monitor();
 
   std::list<RenderArg>::iterator it;
   int i;
@@ -363,6 +366,7 @@
         it->logical_center == launcher_icon->LastLogicalCenter(monitor) &&
         it->rotation == launcher_icon->LastRotation(monitor) &&
         it->skip == launcher_icon->WasSkipping(monitor) &&
+        (launcher_icon->Count() != 0) == launcher_icon->HadCount(monitor) &&
         (launcher_icon->Emblem() != nullptr) == launcher_icon->HadEmblem(monitor))
     {
       continue;
@@ -372,6 +376,7 @@
     launcher_icon->RememberRotation(monitor, it->rotation);
     launcher_icon->RememberSkip(monitor, it->skip);
     launcher_icon->RememberEmblem(monitor, launcher_icon->Emblem() != nullptr);
+    launcher_icon->RememberCount(monitor, launcher_icon->Count() != 0);
 
     float w = icon_size;
     float h = icon_size;
@@ -423,16 +428,26 @@
 
     UpdateIconTransform(launcher_icon, ViewProjectionMatrix, geo, x, y, w, h, z, ui::IconTextureSource::TRANSFORM_HIT_AREA);
 
-    if (launcher_icon->Emblem())
-    {
-      nux::BaseTexture* emblem = launcher_icon->Emblem();
-
+    float emb_w, emb_h;
+    nux::BaseTexture* emblem = launcher_icon->Emblem();
+
+    if (nux::BaseTexture* count_texture = launcher_icon->CountTexture(local::count_scaling(icon_size, pip_style != OUTSIDE_TILE)))
+    {
+      emblem = count_texture;
+      emb_w = emblem->GetWidth();
+      emb_h = emblem->GetHeight();
+    }
+    else if (emblem)
+    {
+      emb_w = std::round(emblem->GetWidth() * scale());
+      emb_h = std::round(emblem->GetHeight() * scale());
+    }
+
+    if (emblem)
+    {
       float w = icon_size;
       float h = icon_size;
 
-      float emb_w = emblem->GetWidth();
-      float emb_h = emblem->GetHeight();
-
       x = it->render_center.x + (icon_size * 0.50f - emb_w - icon_size * 0.05f); // puts right edge of emblem just over the edge of the launcher icon
       y = it->render_center.y - icon_size * 0.50f;     // y = top left corner position of emblem
       z = it->render_center.z;
@@ -718,7 +733,18 @@
                   tile_transform);
   }
 
-  if (arg.icon->Emblem())
+  if (nux::BaseTexture* count_texture = arg.icon->CountTexture(local::count_scaling(icon_size, pip_style != OUTSIDE_TILE)))
+  {
+    RenderElement(GfxContext,
+                  arg,
+                  count_texture->GetDeviceTexture(),
+                  nux::color::White,
+                  nux::color::White,
+                  arg.alpha,
+                  force_filter,
+                  arg.icon->GetTransform(ui::IconTextureSource::TRANSFORM_EMBLEM, monitor));
+  }
+  else if (arg.icon->Emblem())
   {
     RenderElement(GfxContext,
                   arg,
@@ -726,7 +752,7 @@
                   nux::color::White,
                   nux::color::White,
                   arg.alpha,
-                  force_filter,
+                  force_filter || scale != 1.0,
                   arg.icon->GetTransform(ui::IconTextureSource::TRANSFORM_EMBLEM, monitor));
   }
 
 
=== modified file 'unity-shared/IconTextureSource.cpp'
--- unity-shared/IconTextureSource.cpp	2013-10-04 00:46:07 +0000
+++ unity-shared/IconTextureSource.cpp	2014-08-08 15:13:47 +0000
@@ -34,6 +34,7 @@
 IconTextureSource::IconTextureSource()
   : skip_(RENDERERS_SIZE, false)
   , had_emblem_(RENDERERS_SIZE, false)
+  , had_count_(RENDERERS_SIZE, false)
   , last_render_center_(RENDERERS_SIZE)
   , last_logical_center_(RENDERERS_SIZE)
   , last_rotation_(RENDERERS_SIZE)
@@ -91,5 +92,30 @@
   return had_emblem_[monitor];
 }
 
+void IconTextureSource::RememberCount(int monitor, bool has_count)
+{
+  had_count_[monitor] = has_count;
+}
+
+bool IconTextureSource::HadCount(int monitor) const
+{
+  return had_count_[monitor];
+}
+
+unsigned IconTextureSource::Count() const
+{
+  return 0;
+}
+
+nux::BaseTexture* IconTextureSource::Emblem() const
+{
+  return nullptr;
+}
+
+nux::BaseTexture* IconTextureSource::CountTexture(double scale)
+{
+  return nullptr;
+}
+
 }
 }
 \ No newline at end of file
 
=== modified file 'unity-shared/IconTextureSource.h'
--- unity-shared/IconTextureSource.h	2013-11-06 11:21:43 +0000
+++ unity-shared/IconTextureSource.h	2014-08-08 15:13:47 +0000
@@ -62,17 +62,21 @@
   void RememberEmblem(int monitor, bool has_emblem);
   bool HadEmblem(int monitor) const;
 
+  void RememberCount(int monitor, bool has_count);
+  bool HadCount(int monitor) const;
+
   virtual nux::Color BackgroundColor() const = 0;
-
   virtual nux::Color GlowColor() = 0;
-
   virtual nux::BaseTexture* TextureForSize(int size) = 0;
 
-  virtual nux::BaseTexture* Emblem() = 0;
+  virtual unsigned Count() const;
+  virtual nux::BaseTexture* CountTexture(double scale);
+  virtual nux::BaseTexture* Emblem() const;
 
 private:
   std::vector<bool> skip_;
   std::vector<bool> had_emblem_;
+  std::vector<bool> had_count_;
   std::vector<nux::Point3> last_render_center_;
   std::vector<nux::Point3> last_logical_center_;
   std::vector<nux::Vector3> last_rotation_;
 
=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-07-28 17:55:19 +0000
+++ unity-shared/TextInput.cpp	2014-08-08 15:13:47 +0000
@@ -234,9 +234,8 @@
   gtk_style_context_set_path(style_context, widget_path.get());
   gtk_style_context_add_class(style_context, "tooltip");
 
-  glib::Object<PangoLayout> layout;
-  glib::Object<PangoContext> context(gdk_pango_context_get_for_screen(gdk_screen_get_default()));
-  layout = pango_layout_new(context);
+  glib::Object<PangoContext> context(gdk_pango_context_get());
+  glib::Object<PangoLayout> layout(pango_layout_new(context));
 
   std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font_name), pango_font_description_free);
   pango_context_set_font_description(context, desc.get());