Merge lp:~3v1n0/unity/adaptive-icon-count into lp:unity

[Marco Trevisan (Treviño)]

LauncherIcon: make the Icon count width depending on the text value width

LauncherIcon: make the Icon count width depending on the text value width

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2014-08-27 22:39:22 +0000
+++ launcher/LauncherIcon.cpp	2014-08-27 22:39:22 +0000
@@ -60,10 +60,8 @@
 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;
+const int COUNT_FONT_SIZE = 11;
+const int COUNT_PADDING = 2;
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(LauncherIcon);
@@ -103,8 +101,11 @@
   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)));
+
+  auto const& count_rebuild_cb = sigc::mem_fun(this, &LauncherIcon::CleanCountTextures);
+  Settings::Instance().dpi_changed.connect(count_rebuild_cb);
+  Settings::Instance().font_scaling.changed.connect(sigc::hide(count_rebuild_cb));
+  icon_size.changed.connect(sigc::hide(count_rebuild_cb));
 
   for (unsigned i = 0; i < monitors::MAX; ++i)
   {
@@ -1031,41 +1032,44 @@
 void LauncherIcon::CleanCountTextures()
 {
   _counts.clear();
+  EmitNeedsRedraw();
 }
 
 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));
+  int font_size = pango_units_from_double(Settings::Instance().font_scaling() * COUNT_FONT_SIZE);
+  pango_font_description_set_absolute_size(desc.get(), font_size);
   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, count_text.c_str(), -1, '_', nullptr);
+  pango_layout_set_width(layout, pango_units_from_double(icon_size() * 0.75));
+  pango_layout_set_height(layout, -1);
+  pango_layout_set_wrap(layout, PANGO_WRAP_CHAR);
+  pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_MIDDLE);
+  pango_layout_set_text(layout, std::to_string(count).c_str(), -1);
 
   PangoRectangle ink_rect;
   pango_layout_get_pixel_extents(layout, &ink_rect, nullptr);
 
   /* DRAW OUTLINE */
-  float radius = COUNT_HEIGHT / 2.0f - 1.0f;
-  float inset = radius + 1.0f;
+  const float height = ink_rect.height + COUNT_PADDING * 4;
+  const float inset = height / 2.0;
+  const float radius = inset - 1.0f;
+  const float width = ink_rect.width + inset + COUNT_PADDING * 2;
 
-  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, std::round(COUNT_WIDTH * scale), std::round(COUNT_HEIGHT * scale));
+  nux::CairoGraphics cg(CAIRO_FORMAT_ARGB32, std::round(width * scale), std::round(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_move_to(cr, inset, height - 1.0f);
   cairo_arc(cr, inset, inset, radius, 0.5 * M_PI, 1.5 * M_PI);
-  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_arc(cr, width - inset, inset, radius, 1.5 * M_PI, 0.5 * M_PI);
+  cairo_line_to(cr, inset, height - 1.0f);
 
   cairo_set_source_rgba(cr, 0.35f, 0.35f, 0.35f, 1.0f);
   cairo_fill_preserve(cr);
@@ -1077,8 +1081,8 @@
   cairo_set_line_width(cr, 1.0f);
 
   /* DRAW TEXT */
-  cairo_move_to(cr, (COUNT_WIDTH - ink_rect.width) / 2.0 - ink_rect.x,
-                    (COUNT_HEIGHT - ink_rect.height) / 2.0 - ink_rect.y);
+  cairo_move_to(cr, (width - ink_rect.width) / 2.0 - ink_rect.x,
+                    (height - ink_rect.height) / 2.0 - ink_rect.y);
   pango_cairo_show_layout(cr, layout);
 
   return texture_ptr_from_cairo_graphics(cg);
@@ -1177,7 +1181,6 @@
     return;
 
   CleanCountTextures();
-  EmitNeedsRedraw();
 }
 
 void
@@ -1208,7 +1211,6 @@
 LauncherIcon::OnRemoteCountVisibleChanged(LauncherEntryRemote* remote)
 {
   CleanCountTextures();
-  EmitNeedsRedraw();
 }
 
 void
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-02-20 20:52:57 +0000
+++ tests/CMakeLists.txt	2014-08-27 22:39:22 +0000
@@ -131,7 +131,6 @@
        test_favorite_store_gsettings.cpp
        test_favorite_store_private.cpp
        test_launcher_entry_remote.cpp
-       test_launcher_model.cpp
        test_launcher_options.cpp
        test_layout_system.cpp
        test_model_iterator.cpp
@@ -242,6 +241,7 @@
                  test_launcher_hover_machine.cpp
                  test_launcher_icon.cpp
                  test_launcher_minimize_speed.cpp
+                 test_launcher_model.cpp
                  test_launcher_tooltip.cpp
                  test_lockscreen_controller.cpp
                  test_panel_controller.cpp
 
=== modified file 'tests/test_main_xless.cpp'
--- tests/test_main_xless.cpp	2013-02-21 10:47:14 +0000
+++ tests/test_main_xless.cpp	2014-08-27 22:39:22 +0000
@@ -3,18 +3,17 @@
 #include <NuxCore/Logger.h>
 #include <Nux/Nux.h>
 #include <config.h>
-
+#include "test_utils.h"
 
 const gchar* LOCAL_DATA_DIR = BUILDDIR"/tests/data:/usr/share";
 
 int main(int argc, char** argv)
 {
   ::testing::InitGoogleTest(&argc, argv);
-#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
-  g_type_init();
-#endif
+
   setlocale(LC_ALL, "C");
-
+  g_setenv("LC_ALL", "C", TRUE);
+  Utils::init_gsettings_test_environment();
   g_setenv("XDG_DATA_DIRS", LOCAL_DATA_DIR, TRUE);
 
   // Slightly higher as we're more likely to test things we know will fail
 
=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2014-08-27 22:39:22 +0000
+++ unity-shared/IconRenderer.cpp	2014-08-27 22:39:22 +0000
@@ -366,7 +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->Count() == launcher_icon->LastCount(monitor) &&
         (launcher_icon->Emblem() != nullptr) == launcher_icon->HadEmblem(monitor))
     {
       continue;
@@ -376,7 +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);
+    launcher_icon->RememberCount(monitor, launcher_icon->Count());
 
     float w = icon_size;
     float h = icon_size;
 
=== modified file 'unity-shared/IconTextureSource.cpp'
--- unity-shared/IconTextureSource.cpp	2014-08-27 22:39:22 +0000
+++ unity-shared/IconTextureSource.cpp	2014-08-27 22:39:22 +0000
@@ -19,6 +19,7 @@
 
 #include "IconTextureSource.h"
 #include "MultiMonitor.h"
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -34,12 +35,16 @@
 IconTextureSource::IconTextureSource()
   : skip_(RENDERERS_SIZE, false)
   , had_emblem_(RENDERERS_SIZE, false)
-  , had_count_(RENDERERS_SIZE, false)
+  , last_count_(RENDERERS_SIZE, 0)
   , last_render_center_(RENDERERS_SIZE)
   , last_logical_center_(RENDERERS_SIZE)
   , last_rotation_(RENDERERS_SIZE)
   , transformations_(RENDERERS_SIZE, decltype(transformations_)::value_type(TRANSFORM_SIZE, std::vector<nux::Vector4>(4)))
-{}
+{
+  auto reset_count_cb = sigc::mem_fun(this, &IconTextureSource::ResetLastCount);
+  Settings::Instance().dpi_changed.connect(reset_count_cb);
+  Settings::Instance().font_scaling.changed.connect(sigc::hide(reset_count_cb));
+}
 
 std::vector<nux::Vector4> & IconTextureSource::GetTransform(TransformIndex index, int monitor)
 {
@@ -92,14 +97,14 @@
   return had_emblem_[monitor];
 }
 
-void IconTextureSource::RememberCount(int monitor, bool has_count)
+void IconTextureSource::RememberCount(int monitor, unsigned count)
 {
-  had_count_[monitor] = has_count;
+  last_count_[monitor] = count;
 }
 
-bool IconTextureSource::HadCount(int monitor) const
+unsigned IconTextureSource::LastCount(int monitor) const
 {
-  return had_count_[monitor];
+  return last_count_[monitor];
 }
 
 unsigned IconTextureSource::Count() const
@@ -107,6 +112,11 @@
   return 0;
 }
 
+void IconTextureSource::ResetLastCount()
+{
+  std::fill(last_count_.begin(), last_count_.end(), 0);
+}
+
 nux::BaseTexture* IconTextureSource::Emblem() const
 {
   return nullptr;
 
=== modified file 'unity-shared/IconTextureSource.h'
--- unity-shared/IconTextureSource.h	2014-08-27 22:39:22 +0000
+++ unity-shared/IconTextureSource.h	2014-08-27 22:39:22 +0000
@@ -46,7 +46,7 @@
   };
 
   IconTextureSource();
-  virtual ~IconTextureSource() {}
+  virtual ~IconTextureSource() = default;
 
   std::vector<nux::Vector4> & GetTransform(TransformIndex index, int monitor);
 
@@ -62,8 +62,8 @@
   void RememberEmblem(int monitor, bool has_emblem);
   bool HadEmblem(int monitor) const;
 
-  void RememberCount(int monitor, bool has_count);
-  bool HadCount(int monitor) const;
+  void RememberCount(int monitor, unsigned count);
+  unsigned LastCount(int monitor) const;
 
   virtual nux::Color BackgroundColor() const = 0;
   virtual nux::Color GlowColor() = 0;
@@ -74,9 +74,11 @@
   virtual nux::BaseTexture* Emblem() const;
 
 private:
+  void ResetLastCount();
+
   std::vector<bool> skip_;
   std::vector<bool> had_emblem_;
-  std::vector<bool> had_count_;
+  std::vector<unsigned> last_count_;
   std::vector<nux::Point3> last_render_center_;
   std::vector<nux::Point3> last_logical_center_;
   std::vector<nux::Vector3> last_rotation_;