Merge with trunk

(bzr r3844.9.4)

6 files changed, 13 insertions, 13 deletions

diff --git a/launcher/Launcher.cpp b/launcher/Launcher.cpp
index 21aa4088e..2420f4dc7 100644
--- a/launcher/Launcher.cpp
+++ b/launcher/Launcher.cpp
@@ -2200,7 +2200,7 @@ void Launcher::RecvMouseWheel(int /*x*/, int /*y*/, int wheel_delta, unsigned lo
 return;
 
 bool alt_pressed = nux::GetKeyModifierState(key_flags, nux::NUX_STATE_ALT);
- if (alt_pressed)
+ if (alt_pressed && abs(wheel_delta) != NUX_MOUSEWHEEL_DELTA)
 {
 ScrollLauncher(wheel_delta);
 }
diff --git a/launcher/LauncherHideMachine.cpp b/launcher/LauncherHideMachine.cpp
index f348778de..035dea90d 100644
--- a/launcher/LauncherHideMachine.cpp
+++ b/launcher/LauncherHideMachine.cpp
@@ -19,14 +19,10 @@
 
 #include "LauncherHideMachine.h"
 
-#include <NuxCore/Logger.h>
-
 namespace unity
 {
 namespace launcher
 {
-DECLARE_LOGGER(logger, "unity.launcher.hide");
-
 namespace
 {
 const unsigned int HIDE_DELAY_TIMEOUT_LENGTH = 400;
diff --git a/launcher/SimpleLauncherIcon.cpp b/launcher/SimpleLauncherIcon.cpp
index 2fe5b29d8..e0c509f25 100644
--- a/launcher/SimpleLauncherIcon.cpp
+++ b/launcher/SimpleLauncherIcon.cpp
@@ -22,8 +22,6 @@
 
 #include "SimpleLauncherIcon.h"
 
-#include <NuxCore/Logger.h>
-
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UBusMessages.h"
 
@@ -31,8 +29,6 @@ namespace unity
 {
 namespace launcher
 {
-DECLARE_LOGGER(logger, "unity.launcher.icon");
-
 NUX_IMPLEMENT_OBJECT_TYPE(SimpleLauncherIcon);
 
 SimpleLauncherIcon::SimpleLauncherIcon(IconType type)
diff --git a/launcher/SwitcherView.cpp b/launcher/SwitcherView.cpp
index befcc4678..48a660238 100644
--- a/launcher/SwitcherView.cpp
+++ b/launcher/SwitcherView.cpp
@@ -49,6 +49,7 @@ namespace
 
 unsigned int const ANIMATION_LENGTH = 250;
 unsigned int const MAX_DIRECTIONS_CHANGED = 3;
+ unsigned int const SCROLL_WHEEL_EVENTS_DISTANCE = 75;
 double const TEXT_TILE_MULTIPLIER = 3.5;
 }
 
@@ -69,6 +70,7 @@ SwitcherView::SwitcherView(ui::AbstractIconRenderer::Ptr const& renderer)
 , animation_(animation_length)
 , last_icon_selected_(-1)
 , last_detail_icon_selected_(-1)
+ , last_mouse_scroll_time_(0)
 , check_mouse_first_time_(true)
 {
 icon_renderer_->pip_style = OVER_TILE;
@@ -437,6 +439,13 @@ void SwitcherView::HandleMouseUp(int x, int y, int button)
 
 void SwitcherView::RecvMouseWheel(int /*x*/, int /*y*/, int wheel_delta, unsigned long /*button_flags*/, unsigned long /*key_flags*/)
 {
+ auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
+
+ if (timestamp - last_mouse_scroll_time_ <= SCROLL_WHEEL_EVENTS_DISTANCE)
+ return;
+
+ last_mouse_scroll_time_ = timestamp;
+
 if (model_->detail_selection)
 {
 HandleDetailMouseWheel(wheel_delta);
@@ -449,7 +458,7 @@ void SwitcherView::RecvMouseWheel(int /*x*/, int /*y*/, int wheel_delta, unsigne
 
 void SwitcherView::HandleDetailMouseWheel(int wheel_delta)
 {
- if (wheel_delta > 0)
+ if (wheel_delta < 0)
 {
 model_->NextDetail();
 }
@@ -461,7 +470,7 @@ void SwitcherView::HandleDetailMouseWheel(int wheel_delta)
 
 void SwitcherView::HandleMouseWheel(int wheel_delta)
 {
- if (wheel_delta > 0)
+ if (wheel_delta < 0)
 {
 model_->Next();
 }
diff --git a/launcher/SwitcherView.h b/launcher/SwitcherView.h
index 392aac293..2dd595a11 100644
--- a/launcher/SwitcherView.h
+++ b/launcher/SwitcherView.h
@@ -157,6 +157,7 @@ private:
 
 int last_icon_selected_;
 int last_detail_icon_selected_;
+ uint64_t last_mouse_scroll_time_;
 bool check_mouse_first_time_;
 
 DeltaTracker delta_tracker_;
diff --git a/launcher/VolumeLauncherIcon.cpp b/launcher/VolumeLauncherIcon.cpp
index 0cec6afeb..e6cbe1cc7 100644
--- a/launcher/VolumeLauncherIcon.cpp
+++ b/launcher/VolumeLauncherIcon.cpp
@@ -21,7 +21,6 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
-#include <NuxCore/Logger.h>
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/GLibSignal.h>
 
@@ -32,7 +31,6 @@ namespace unity
 {
 namespace launcher
 {
-DECLARE_LOGGER(logger, "unity.launcher.icon.volume");
 
 //
 // Start private implementation