Merge lp:~nick-dedekind/unity/lp893140.launcher-icon-feedback into lp:unity

[Nick Dedekind]

Inverted launcher icon blink/pulse on application start for immediate feedback. (LP: #893140)

= Problem description =

https://bugs.launchpad.net/ayatana-design/+bug/893140

= The fix =

Inverted launcher icon blink/pulse on application start for immediate feedback.

= Test coverage =

Unit test for correct icon blink/pulse values at start of animation.

[Nick Dedekind (nick-dedekind)]

Transition:
http://ubuntuone.com/1k07OmG8oVHj7nquAXa4eJ

Unfortunately you can't actually see when the mouse is clicked to activate the application, but you will have to trust that it's at the point of the start of the icon background inversion.

[Brandon Schaefer (brandontschaefer)]

Awesome looks good, and works for me. Possibly a manual test?

[Didier Roche (didrocks)]

Hey Bradon, Nick,

as discussed during the week pre-UDS, no more manual tests permitted as we will have automated daily upload to ubuntu, and so, no way to have manual perf performed before a release. Please instrument this part of code so that we can have an unit test.

[Stephen M. Webb (bregma)]

Needs test.

review: Needs Fixing

[lp:~nick-dedekind/unity/lp893140.launcher-icon-feedback]

2868. By Nick Dedekind on 2012-11-08

Added launcher icon blink/pulse test.

[Nick Dedekind (nick-dedekind)]

Added unit tests

[Brandon Schaefer (brandontschaefer)]

Looks good, unit tests pass (though...a bit evil). When the conflict gets fixed, and JohnLea apporves this is ready for a merge.

review: Approve

[lp:~nick-dedekind/unity/lp893140.launcher-icon-feedback]

2869. By Nick Dedekind on 2012-11-09

Merge with trunk.

[Nick Dedekind (nick-dedekind)]

fixed conflicts.

[Marco Trevisan (Treviño) (3v1n0)]

Looks good to me.

review: Approve

[Nick Dedekind (nick-dedekind)]

This is a UI feature.
Not supposed to be approved without design approval!

[John Lea (johnlea)]

review: Approve (design)

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-11-08 09:12:24 +0000
+++ launcher/Launcher.cpp	2012-11-09 09:21:19 +0000
@@ -640,15 +640,27 @@
 
 float Launcher::IconStartingBlinkValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
+    return 1.0f;
+
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::STARTING))
+    return 1.0f;
+
   struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
   int starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
   double starting_progress = (double) CLAMP((float) starting_ms / (float)(ANIM_DURATION_LONG * STARTING_BLINK_LAMBDA), 0.0f, 1.0f);
   double val = IsBackLightModeToggles() ? 3.0f : 4.0f;
-  return 0.5f + (float)(std::cos(M_PI * val * starting_progress)) * 0.5f;
+  return 1.0f-(0.5f + (float)(std::cos(M_PI * val * starting_progress)) * 0.5f);
 }
 
 float Launcher::IconStartingPulseValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
+    return 1.0f;
+
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::STARTING))
+    return 1.0f;
+
   struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
   int starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
   double starting_progress = (double) CLAMP((float) starting_ms / (float)(ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2), 0.0f, 1.0f);
@@ -659,7 +671,7 @@
     icon->ResetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
   }
 
-  return 0.5f + (float)(std::cos(M_PI * (float)(MAX_STARTING_BLINKS * 2) * starting_progress)) * 0.5f;
+  return 1.0f-(0.5f + (float)(std::cos(M_PI * (float)(MAX_STARTING_BLINKS * 2) * starting_progress)) * 0.5f);
 }
 
 float Launcher::IconBackgroundIntensity(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2012-11-06 18:19:09 +0000
+++ tests/test_launcher.cpp	2012-11-09 09:21:19 +0000
@@ -80,65 +80,22 @@
       return AbstractLauncherIcon::Ptr();
     }
 
-    float IconBackgroundIntensity(AbstractLauncherIcon::Ptr const& icon, timespec const& current) const
-    {
-      return Launcher::IconBackgroundIntensity(icon, current);
-    }
-
-    void StartIconDrag(AbstractLauncherIcon::Ptr const& icon)
-    {
-      Launcher::StartIconDrag(icon);
-    }
-
-    void ShowDragWindow()
-    {
-      Launcher::ShowDragWindow();
-    }
-
-    void EndIconDrag()
-    {
-      Launcher::EndIconDrag();
-    }
-
-    void UpdateDragWindowPosition(int x, int y)
-    {
-      Launcher::UpdateDragWindowPosition(x, y);
-    }
-
-    void HideDragWindow()
-    {
-      Launcher::HideDragWindow();
-    }
-
-    void ResetMouseDragState()
-    {
-      Launcher::ResetMouseDragState();
-    }
-
-    bool DndIsSpecialRequest(std::string const& uri) const
-    {
-      return Launcher::DndIsSpecialRequest(uri);
-    }
-
-    int GetDragIconPosition() const
-    {
-      return _drag_icon_position;
-    }
-
-    void ProcessDndEnter()
-    {
-      Launcher::ProcessDndEnter();
-    }
-
-    void ProcessDndLeave()
-    {
-      Launcher::ProcessDndLeave();
-    }
-
-    void ProcessDndMove(int x, int y, std::list<char*> mimes)
-    {
-      Launcher::ProcessDndMove(x, y, mimes);
-    }
+    using Launcher::IconBackgroundIntensity;
+    using Launcher::StartIconDrag;
+    using Launcher::ShowDragWindow;
+    using Launcher::EndIconDrag;
+    using Launcher::UpdateDragWindowPosition;
+    using Launcher::HideDragWindow;
+    using Launcher::ResetMouseDragState;
+    using Launcher::DndIsSpecialRequest;
+    using Launcher::ProcessDndEnter;
+    using Launcher::ProcessDndLeave;
+    using Launcher::ProcessDndMove;
+    using Launcher::ProcessDndDrop;
+    using Launcher::_drag_icon_position;
+
+    using Launcher::IconStartingBlinkValue;
+    using Launcher::IconStartingPulseValue;
 
     void FakeProcessDndMove(int x, int y, std::list<std::string> uris)
     {
@@ -158,11 +115,6 @@
 
       _dnd_hovered_icon = MouseIconIntersection(x, y);
     }
-
-    void ProcessDndDrop(int x, int y)
-    {
-      Launcher::ProcessDndDrop(x, y);
-    }
   };
 
   TestLauncher()
@@ -354,7 +306,7 @@
   // Start dragging icon2
   launcher_->StartIconDrag(icon2);
   launcher_->ShowDragWindow();
-  ASSERT_EQ(launcher_->GetDragIconPosition(), model_->IconIndex(icon2));
+  ASSERT_EQ(launcher_->_drag_icon_position, model_->IconIndex(icon2));
 
   // Moving icon2 at the end
   auto const& center3 = icon3->GetCenter(launcher_->monitor());
@@ -364,7 +316,7 @@
   model_->saved.connect([&model_saved] { model_saved = true; });
   EXPECT_CALL(*icon2, Stick(false));
 
-  ASSERT_NE(launcher_->GetDragIconPosition(), model_->IconIndex(icon2));
+  ASSERT_NE(launcher_->_drag_icon_position, model_->IconIndex(icon2));
   launcher_->EndIconDrag();
 
   // The icon order should be reset
@@ -391,7 +343,7 @@
   // Start dragging icon2
   launcher_->StartIconDrag(icon2);
   launcher_->ShowDragWindow();
-  ASSERT_EQ(launcher_->GetDragIconPosition(), model_->IconIndex(icon2));
+  ASSERT_EQ(launcher_->_drag_icon_position, model_->IconIndex(icon2));
 
   // Moving icon2 at the end
   auto center3 = icon3->GetCenter(launcher_->monitor());
@@ -408,7 +360,7 @@
   bool model_saved = false;
   model_->saved.connect([&model_saved] { model_saved = true; });
 
-  ASSERT_EQ(launcher_->GetDragIconPosition(), model_->IconIndex(icon2));
+  ASSERT_EQ(launcher_->_drag_icon_position, model_->IconIndex(icon2));
   launcher_->EndIconDrag();
 
   // The icon order should be reset
@@ -524,6 +476,30 @@
   EXPECT_TRUE(add_request);
 }
 
+TEST_F(TestLauncher, IconStartingPulseValue)
+{  
+  struct timespec current;
+  clock_gettime(CLOCK_MONOTONIC, &current);
+  MockMockLauncherIcon::Ptr icon(new MockMockLauncherIcon);
+
+  icon->SetQuirk(AbstractLauncherIcon::Quirk::STARTING, true);
+
+  // Pulse value should start at 0.
+  EXPECT_EQ(launcher_->IconStartingPulseValue(icon, current), 0.0);
+}
+
+TEST_F(TestLauncher, IconStartingBlinkValue)
+{  
+  struct timespec current;
+  clock_gettime(CLOCK_MONOTONIC, &current);
+  MockMockLauncherIcon::Ptr icon(new MockMockLauncherIcon);
+
+  icon->SetQuirk(AbstractLauncherIcon::Quirk::STARTING, true);
+
+  // Pulse value should start at 0.
+  EXPECT_EQ(launcher_->IconStartingBlinkValue(icon, current), 0.0);
+}
+
 }
 }