Merge lp:~nick-dedekind/unity/lp1052582.usc-icon-animation into lp:unity

[Nick Dedekind]

Only animate drag icon with USC icon if sourced from a valid point on screen.
Added tool-tip animation when app installation completes.

Only animate drag icon with USC icon if sourced from a valid point on screen.
Added tool-tip animation when app installation completes.

[Nick Dedekind (nick-dedekind)]

Screen-cast available at http://ubuntuone.com/3LtiQJrpChi8MwVobKPeXr

[Brandon Schaefer (brandontschaefer)]

Looks good to me. +1 (Just need to fix a conflict)

review: Approve

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-10-04 08:00:29 +0000
+++ launcher/LauncherController.cpp	2012-10-10 16:40:27 +0000
@@ -384,12 +384,19 @@
     // to compute its center
     RegisterIcon(result, GetLastIconPriority<ApplicationLauncherIcon>("", true));
 
-    // This will ensure that the center of the new icon is set, so that
-    // the animation could be done properly.
-    sources_.AddIdle([this, icon_x, icon_y, result] {
-      result->Animate(CurrentLauncher(), icon_x, icon_y);
-      return false;
-    });
+    if (icon_x > 0 || icon_y > 0)
+    {
+      // This will ensure that the center of the new icon is set, so that
+      // the animation could be done properly.
+      sources_.AddIdle([this, icon_x, icon_y, result] {
+        result->Animate(CurrentLauncher(), icon_x, icon_y);
+        return false;
+      });
+    }
+    else
+    {
+      result->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, true); 
+    }
   }
 }
 

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2012-10-04 08:00:29 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2012-10-10 16:40:27 +0000
@@ -30,6 +30,13 @@
 namespace launcher
 {
 
+namespace
+{
+#define SOURCE_SHOW_TOOLTIP "ShowTooltip"
+#define SOURCE_HIDE_TOOLTIP "HideTooltip"
+const int INSTALL_TIP_DURATION = 1500;
+}
+
 NUX_IMPLEMENT_OBJECT_TYPE(SoftwareCenterLauncherIcon);
 
 SoftwareCenterLauncherIcon::SoftwareCenterLauncherIcon(BamfApplication* app,
@@ -122,6 +129,17 @@
       SetProgress(0.0f);
       finished_ = true;
       needs_urgent_ = true;
+
+      sources_.AddIdle([this]()
+      {
+        ShowTooltip();
+        sources_.AddTimeout(INSTALL_TIP_DURATION, [this]()
+        {
+          HideTooltip();
+          return false;
+        }, SOURCE_HIDE_TOOLTIP);
+        return false;
+      }, SOURCE_SHOW_TOOLTIP);
    }
    else
    {

=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
--- launcher/SoftwareCenterLauncherIcon.h	2012-10-04 08:00:29 +0000
+++ launcher/SoftwareCenterLauncherIcon.h	2012-10-10 16:40:27 +0000
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <UnityCore/GLibDBusProxy.h>
+#include <UnityCore/GLibSource.h>
 #include "ApplicationLauncherIcon.h"
 #include "LauncherDragWindow.h"
 
@@ -59,6 +60,7 @@
   nux::ObjectPtr<nux::IOpenGLBaseTexture> icon_texture_;
   nux::ObjectPtr<LauncherDragWindow> drag_window_;
   nux::ObjectPtr<Launcher> launcher_;
+  glib::SourceManager sources_;
   bool finished_;
   bool needs_urgent_;