Merge lp:~bilalakhtar/unity/launcher-scroll-speed-906072 into lp:unity

[Bilal Akhtar]

Increases launcher scroll speed using mouse wheel by 2.5 times the original.

Increases launcher scroll speed using mouse wheel by 2.5 times the original. In the original bug report, John said "at least twice", and 2.5x seems good for me. Since everyone's tastes differ, I'm sure others might prefer 3x or 2x or something. Feel free to add your comments.

Bug #906072

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

+1 for the change, could you add some unit-tests for it?

[Bilal Akhtar (bilalakhtar)]

I sure will, thanks Marco for the suggestion!

[Andrea Azzarone (azzar1)]

LGTM. BTW I'd prefer to use EmitMouseWheel.

review: Approve

[Bilal Akhtar (bilalakhtar)]

I've added unit tests now, the branch is ready for a re-review.

[Andrea Azzarone (azzar1)]

Ok approving again. Note that unit-test should not depend on global state (**launcher_->SetHover(true);***) but Launcher code is not test-friendly.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Omer Akram (om26er)]

added commit message and status approved again.

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in tests/test_launcher.cpp

[Bilal Akhtar (bilalakhtar)]

Branch ready to be merged again. I've resolved the conflicts.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1110/console reported an error when processing this lp:~bilalakhtar/unity/launcher-scroll-speed-906072 branch.
Not merging it.

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-08-17 06:19:06 +0000
+++ launcher/Launcher.cpp	2012-08-21 17:48:18 +0000
@@ -2293,12 +2293,12 @@
   if (wheel_delta < 0)
   {
     // scroll up
-    _launcher_drag_delta -= 10;
+    _launcher_drag_delta -= 25;
   }
   else
   {
     // scroll down
-    _launcher_drag_delta += 10;
+    _launcher_drag_delta += 25;
   }
 
   EnsureAnimation();
@@ -2865,5 +2865,10 @@
   return true;
 }
 
+int Launcher::GetDragDelta() const
+{
+  return _launcher_drag_delta;
+}
+
 } // namespace launcher
 } // namespace unity

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-08-17 00:27:16 +0000
+++ launcher/Launcher.h	2012-08-21 17:48:18 +0000
@@ -115,6 +115,9 @@
 
   void Resize();
 
+  int GetDragDelta() const;
+  void SetHover(bool hovered);
+
   sigc::signal<void, char*, AbstractLauncherIcon::Ptr> launcher_addrequest;
   sigc::signal<void, AbstractLauncherIcon::Ptr> launcher_removerequest;
   sigc::signal<void, AbstractLauncherIcon::Ptr> icon_animation_complete;
@@ -246,7 +249,6 @@
   float IconCenterTransitionProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
   float IconVisibleProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const;
 
-  void SetHover(bool hovered);
   void SetHidden(bool hidden);
 
   void UpdateChangeInMousePosition(int delta_x, int delta_y);

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2012-08-13 09:44:44 +0000
+++ tests/test_launcher.cpp	2012-08-21 17:48:18 +0000
@@ -109,6 +109,23 @@
   EXPECT_TRUE(third->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT));
 }
 
+TEST_F(TestLauncher, TestMouseWheelScroll)
+{
+  int initial_scroll_delta;
+
+  launcher_->SetHover(true);
+  initial_scroll_delta = launcher_->GetDragDelta();
+
+  // scroll down
+  launcher_->RecvMouseWheel(0,0,20,0,0);
+  EXPECT_EQ((launcher_->GetDragDelta() - initial_scroll_delta), 25);
+
+  // scroll up
+  launcher_->RecvMouseWheel(0,0,-20,0,0);
+  EXPECT_EQ(launcher_->GetDragDelta(), initial_scroll_delta);
+
+  launcher_->SetHover(false);
+}
 
 TEST_F(TestLauncher, TestIconBackgroundIntensity)
 {
@@ -139,4 +156,3 @@
 
 }
 }
-