Merge lp:~3v1n0/unity/preprocess-on-icon-count-change into lp:unity

[Marco Trevisan (Treviño)]

IconRenderer: preprocess an icon if its emblem has been shown/hidden

In that way we can update its transformation.

If an icon set/unset its emblem, we should update its transformation, otherwise it won't be drawn or it will be drawn with the wrong transformation.

Proposing against trunk since this won't touch any bit of the 100-scopes branch.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3314
http://jenkins.qa.ubuntu.com/job/unity-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/33
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/33/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/33

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM, i wonder what the CI failure was...

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-03-21 16:29:34 +0000
+++ launcher/LauncherIcon.cpp	2013-04-23 00:52:29 +0000
@@ -1144,13 +1144,14 @@
   if (!remote->CountVisible())
     return;
 
-  std::string text;
-  if (remote->Count() > 9999)
-    text = "****";
+  if (remote->Count() / 10000 != 0)
+  {
+    SetEmblemText("****");
+  }
   else
-    text = std::to_string(remote->Count());
-
-  SetEmblemText(text);
+  {
+    SetEmblemText(std::to_string(remote->Count()));
+  }
 }
 
 void

=== modified file 'unity-shared/IconRenderer.cpp'
--- unity-shared/IconRenderer.cpp	2013-04-10 21:41:57 +0000
+++ unity-shared/IconRenderer.cpp	2013-04-23 00:52:29 +0000
@@ -300,7 +300,8 @@
     if (it->render_center == launcher_icon->LastRenderCenter(monitor) &&
         it->logical_center == launcher_icon->LastLogicalCenter(monitor) &&
         it->rotation == launcher_icon->LastRotation(monitor) &&
-        it->skip == launcher_icon->WasSkipping(monitor))
+        it->skip == launcher_icon->WasSkipping(monitor) &&
+        (launcher_icon->Emblem() != nullptr) == launcher_icon->HadEmblem())
     {
       continue;
     }
@@ -308,6 +309,7 @@
     launcher_icon->RememberCenters(monitor, it->render_center, it->logical_center);
     launcher_icon->RememberRotation(monitor, it->rotation);
     launcher_icon->RememberSkip(monitor, it->skip);
+    launcher_icon->RememberEmblem(launcher_icon->Emblem() != nullptr);
 
     float w = icon_size;
     float h = icon_size;

=== modified file 'unity-shared/IconTextureSource.cpp'
--- unity-shared/IconTextureSource.cpp	2013-04-12 23:33:52 +0000
+++ unity-shared/IconTextureSource.cpp	2013-04-23 00:52:29 +0000
@@ -32,7 +32,8 @@
 }
 
 IconTextureSource::IconTextureSource()
-  : skip_(RENDERERS_SIZE, false)
+  : had_emblem_(false)
+  , skip_(RENDERERS_SIZE, false)
   , last_render_center_(RENDERERS_SIZE)
   , last_logical_center_(RENDERERS_SIZE)
   , last_rotation_(RENDERERS_SIZE)
@@ -80,5 +81,15 @@
   return skip_[monitor];
 }
 
+void IconTextureSource::RememberEmblem(bool has_emblem)
+{
+  had_emblem_ = has_emblem;
+}
+
+bool IconTextureSource::HadEmblem() const
+{
+  return had_emblem_;
+}
+
 }
 }
\ No newline at end of file

=== modified file 'unity-shared/IconTextureSource.h'
--- unity-shared/IconTextureSource.h	2013-04-12 23:33:52 +0000
+++ unity-shared/IconTextureSource.h	2013-04-23 00:52:29 +0000
@@ -58,6 +58,9 @@
   void RememberSkip(int monitor, bool skip);
   bool WasSkipping(int monitor) const;
 
+  void RememberEmblem(bool has_emblem);
+  bool HadEmblem() const;
+
   virtual nux::Color BackgroundColor() const = 0;
 
   virtual nux::Color GlowColor() = 0;
@@ -67,6 +70,7 @@
   virtual nux::BaseTexture* Emblem() = 0;
 
 private:
+  bool had_emblem_;
   std::vector<bool> skip_;
   std::vector<nux::Point3> last_render_center_;
   std::vector<nux::Point3> last_logical_center_;