Merge lp:~brandontschaefer/unity/lp.1223630-fix into lp:unity

[Brandon Schaefer]

Only accept focus if the mouse moves in 3 directions on switcher start up if the mouse starts over the switcher window. This is an attempt to tell the difference between a bump and intentional movement.

Only accept focus if the mouse moves in 3 directions on switcher start up if the mouse starts over the switcher window. This is an attempt to tell the difference between a bump and intentional movement.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3496
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brandontschaefer/unity/lp.1223630-fix/+merge/186417/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/370/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/258

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3497
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brandontschaefer/unity/lp.1223630-fix/+merge/186417/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/372/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/260

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3499
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brandontschaefer/unity/lp.1223630-fix/+merge/186417/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/373/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/262/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/260/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/261/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3500
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brandontschaefer/unity/lp.1223630-fix/+merge/186417/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/374/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/262

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3501
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brandontschaefer/unity/lp.1223630-fix/+merge/186417/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-ci/376/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/263
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/264

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

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

This looks good! Hopefully, the bugs will be slow to come in;)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3504
http://jenkins.qa.ubuntu.com/job/unity-ci/379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/267

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

review: Approve (continuous-integration)

=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2013-03-21 16:22:34 +0000
+++ launcher/CMakeLists.txt	2013-09-19 20:08:39 +0000
@@ -81,6 +81,7 @@
 add_pch(pch/launcher_pch.hh launcher-lib)
 
 set (SWITCHER_SOURCES
+      DeltaTracker.cpp
       SwitcherController.cpp
       SwitcherModel.cpp
       SwitcherView.cpp

=== added file 'launcher/DeltaTracker.cpp'
--- launcher/DeltaTracker.cpp	1970-01-01 00:00:00 +0000
+++ launcher/DeltaTracker.cpp	2013-09-19 20:08:39 +0000
@@ -0,0 +1,80 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Brandon Schaefer <[e-mail]>
+ */
+
+#include "DeltaTracker.h"
+
+namespace unity
+{
+
+DeltaTracker::DeltaTracker()
+  : delta_state_(DeltaState::NONE)
+{
+}
+
+void DeltaTracker::HandleNewMouseDelta(int dx, int dy)
+{
+  if (dx > 0)
+  {
+    delta_state_ |= DeltaState::RIGHT;
+  }
+  else if (dx < 0)
+  {
+    delta_state_ |= DeltaState::LEFT;
+  }
+
+  if (dy > 0)
+  {
+    delta_state_ |= DeltaState::DOWN;
+  }
+  else if (dy < 0)
+  {
+    delta_state_ |= DeltaState::UP;
+  }
+}
+
+void DeltaTracker::ResetState()
+{
+  delta_state_ = DeltaState::NONE;
+}
+
+unsigned int DeltaTracker::AmountOfDirectionsChanged() const
+{
+  unsigned int directions_changed = 0;
+
+  if (HasState(DeltaState::RIGHT))
+    directions_changed++;
+
+  if (HasState(DeltaState::LEFT))
+    directions_changed++;
+
+  if (HasState(DeltaState::UP))
+    directions_changed++;
+
+  if (HasState(DeltaState::DOWN))
+    directions_changed++;
+
+  return directions_changed;
+}
+
+bool DeltaTracker::HasState(DeltaState const& state) const
+{
+  return (delta_state_ & state);
+}
+
+}

=== added file 'launcher/DeltaTracker.h'
--- launcher/DeltaTracker.h	1970-01-01 00:00:00 +0000
+++ launcher/DeltaTracker.h	2013-09-19 20:08:39 +0000
@@ -0,0 +1,53 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Brandon Schaefer <[e-mail]>
+ */
+
+#ifndef DELTA_TRACKER_H
+#define DELTA_TRACKER_H
+
+namespace unity
+{
+
+class DeltaTracker
+{
+public:
+  DeltaTracker();
+
+  void HandleNewMouseDelta(int dx, int dy);
+  void ResetState();
+
+  unsigned int AmountOfDirectionsChanged() const;
+
+private:
+  enum DeltaState
+  {
+    NONE  = 1 << 0,
+    RIGHT = 1 << 1,
+    DOWN  = 1 << 2,
+    LEFT  = 1 << 3,
+    UP    = 1 << 4
+  };
+
+  bool HasState(DeltaState const& state) const;
+
+  unsigned int delta_state_;
+};
+
+}
+
+#endif // DELTA_TRACKER_H

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2013-09-09 23:19:45 +0000
+++ launcher/SwitcherView.cpp	2013-09-19 20:08:39 +0000
@@ -39,6 +39,7 @@
   unsigned int const VERTICAL_PADDING = 45;
   unsigned int const SPREAD_OFFSET = 100;
   unsigned int const EXTRA_ICON_SPACE = 10;
+  unsigned int const MAX_DIRECTIONS_CHANGED = 3; 
 }
 
 NUX_IMPLEMENT_OBJECT_TYPE(SwitcherView);
@@ -206,6 +207,7 @@
   text_view_->SetVisible(!detail);
 
   last_detail_icon_selected_ = -1;
+  check_mouse_first_time_ = true;
 
   if (!detail)
   {
@@ -222,6 +224,8 @@
   if (selection)
     text_view_->SetText(selection->tooltip_text());
 
+  delta_tracker_.ResetState();
+
   SaveLast();
   QueueDraw();
 }
@@ -234,8 +238,33 @@
   return {geo.x + x, geo.y + y};
 }
 
-void SwitcherView::RecvMouseMove(int x, int y, int /*dx*/, int /*dy*/, unsigned long /*button_flags*/, unsigned long /*key_flags*/)
-{
+void SwitcherView::MouseHandlingBackToNormal()
+{
+  check_mouse_first_time_ = false;
+  last_icon_selected_ = -1;
+  last_detail_icon_selected_ = -1;
+}
+
+void SwitcherView::RecvMouseMove(int x, int y, int dx, int dy, unsigned long /*button_flags*/, unsigned long /*key_flags*/)
+{
+  // We just started, and want to check if we are a bump or not.
+  // Once we are no longer a bump, skip!!
+  if (check_mouse_first_time_)
+  {
+    if (CheckMouseInsideBackground(x,y))
+    {
+      delta_tracker_.HandleNewMouseDelta(dx, dy);
+      if (delta_tracker_.AmountOfDirectionsChanged() >= MAX_DIRECTIONS_CHANGED)
+      {
+        MouseHandlingBackToNormal();
+      }
+    }
+    else
+    {
+      MouseHandlingBackToNormal();
+    }
+  }
+
   if (model_->detail_selection)
   {
     HandleDetailMouseMove(x, y);
@@ -254,7 +283,6 @@
   if (check_mouse_first_time_)
   {
     last_detail_icon_selected_ = detail_icon_index;
-    check_mouse_first_time_ = false;
     return;
   }
 
@@ -276,7 +304,6 @@
   if (check_mouse_first_time_)
   {
     last_icon_selected_ = icon_index;
-    check_mouse_first_time_ = false;
     return;
   }
 
@@ -364,6 +391,10 @@
       model_->detail_selection_index = detail_icon_index;
       hide_request.emit(true);
     }
+    else if (detail_icon_index < 0)
+    {
+      model_->detail_selection = false;
+    }
   }
   else if (button == 3)
   {
@@ -558,13 +589,13 @@
   return result;
 }
 
-void SwitcherView::GetFlatIconPositions (int n_flat_icons,
-                                         int size,
-                                         int selection,
-                                         int &first_flat,
-                                         int &last_flat,
-                                         int &half_fold_left,
-                                         int &half_fold_right)
+void GetFlatIconPositions (int n_flat_icons,
+                           int size,
+                           int selection,
+                           int &first_flat,
+                           int &last_flat,
+                           int &half_fold_left,
+                           int &half_fold_right)
 {
   half_fold_left = -1;
   half_fold_right = -1;

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2013-09-05 18:12:25 +0000
+++ launcher/SwitcherView.h	2013-09-19 20:08:39 +0000
@@ -20,6 +20,7 @@
 #ifndef SWITCHERVIEW_H
 #define SWITCHERVIEW_H
 
+#include "DeltaTracker.h"
 #include "SwitcherModel.h"
 #include "unity-shared/AbstractIconRenderer.h"
 #include "unity-shared/StaticCairoText.h"
@@ -132,15 +133,13 @@
   nux::Size SpreadSize();
 
   double GetCurrentProgress();
-  void GetFlatIconPositions(int n_flat_icons, int size, int selection,
-                            int &first_flat, int &last_flat,
-                            int &half_fold_left, int &half_fold_right);
 
   void SaveTime();
   void ResetTimer();
   void SaveLast();
 
   bool CheckMouseInsideBackground(int x, int y) const;
+  void MouseHandlingBackToNormal();
 
   SwitcherModel::Ptr model_;
   ui::LayoutSystem layout_system_;
@@ -152,6 +151,8 @@
   bool target_sizes_set_;
   bool check_mouse_first_time_;
 
+  DeltaTracker delta_tracker_;
+
   std::list<ui::RenderArg> last_args_;
   std::list<ui::RenderArg> saved_args_;
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-09-13 00:40:45 +0000
+++ tests/CMakeLists.txt	2013-09-19 20:08:39 +0000
@@ -134,6 +134,7 @@
        test_abstract_interface_generator.cpp
        test_animation_utils.cpp
        test_connection_manager.cpp
+       test_delta_tracker.cpp
        test_glib_dbus_object.cpp
        test_glib_cancellable.cpp
        test_glib_object.cpp
@@ -178,6 +179,7 @@
       unity-shared
       unity-shared-standalone
       launcher-lib
+      switcher-lib
       ${GMOCK_LIB}
       ${GMOCK_MAIN_LIB}
       ${LIBS}

=== added file 'tests/test_delta_tracker.cpp'
--- tests/test_delta_tracker.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_delta_tracker.cpp	2013-09-19 20:08:39 +0000
@@ -0,0 +1,83 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Brandon Schaefer <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+using namespace testing;
+
+#include "launcher/DeltaTracker.h"
+
+namespace unity
+{
+
+class TestDeltaTracker : public Test
+{
+public:
+  TestDeltaTracker()
+  {
+  }
+
+  DeltaTracker delta_tracker_;
+};
+
+
+TEST_F(TestDeltaTracker, TestDirectionEmptyOnStart)
+{
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 0);
+}
+
+TEST_F(TestDeltaTracker, TestCorrectDirections)
+{
+  delta_tracker_.HandleNewMouseDelta(0, -1);
+  delta_tracker_.HandleNewMouseDelta(1, 0);
+
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 2);
+}
+
+TEST_F(TestDeltaTracker, TestNoDuplicates)
+{
+  delta_tracker_.HandleNewMouseDelta(0, -1);
+  delta_tracker_.HandleNewMouseDelta(0, -1);
+
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 1);
+}
+
+TEST_F(TestDeltaTracker, TestAllDirections)
+{
+  delta_tracker_.HandleNewMouseDelta(0, -1);
+  delta_tracker_.HandleNewMouseDelta(0, 1);
+  delta_tracker_.HandleNewMouseDelta(-1, 0);
+  delta_tracker_.HandleNewMouseDelta(1, 0);
+
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 4);
+}
+
+TEST_F(TestDeltaTracker, TestResetStates)
+{
+  delta_tracker_.HandleNewMouseDelta(0, -1);
+  delta_tracker_.HandleNewMouseDelta(0, 1);
+  delta_tracker_.HandleNewMouseDelta(-1, 0);
+  delta_tracker_.HandleNewMouseDelta(1, 0);
+
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 4);
+
+  delta_tracker_.ResetState();
+  ASSERT_EQ(delta_tracker_.AmountOfDirectionsChanged(), 0);
+}
+
+}