Merge lp:~nux-team/nux/lp-1228093 into lp:nux/trusty

[Stephen M. Webb]

ScrollView: correctly handle vertical and horizontal scrolling.

Correctly handle vertical and horizontal scrolling.

Fix cherry-picked from dev branch for SRU into Ubuntu 14.04.

[Eleni Maria Stea (hikiko)]

review: Approve

=== modified file 'Nux/ScrollView.cpp'
--- Nux/ScrollView.cpp	2013-04-08 14:02:32 +0000
+++ Nux/ScrollView.cpp	2014-09-30 12:54:09 +0000
@@ -712,14 +712,31 @@
   {
     // nux can't tell the difference between horizontal and vertical mouse wheel events
     // so we are only going to support vertical
-    if (wheel_delta < 0)
-    {
-      ScrollDown(abs(wheel_delta / NUX_MOUSEWHEEL_DELTA), m_MouseWheelScrollSize);
-    }
-    else
-    {
-      ScrollUp(abs(wheel_delta / NUX_MOUSEWHEEL_DELTA), m_MouseWheelScrollSize);
-    }
+    if (abs(wheel_delta) == NUX_MOUSEWHEEL_DELTA)
+    {
+      // Vertical Scrolling
+      if (wheel_delta < 0)
+      {
+        ScrollDown(1, m_MouseWheelScrollSize);
+      }
+      else
+      {
+        ScrollUp(1, m_MouseWheelScrollSize);
+      }
+    }
+    else if (abs(wheel_delta) == (NUX_MOUSEWHEEL_DELTA ^ 2))
+    {
+      // Horizontal Scrolling
+      if (wheel_delta < 0)
+      {
+        ScrollRight(1, m_MouseWheelScrollSize);
+      }
+      else
+      {
+        ScrollLeft(1, m_MouseWheelScrollSize);
+      }
+    }
+    
   }
 
   bool ScrollView::AcceptKeyNavFocus()

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2013-12-18 21:43:30 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2014-09-30 12:54:09 +0000
@@ -1200,7 +1200,7 @@
       {
         _mouse_state |= NUX_EVENT_MOUSEWHEEL;
         m_pEvent->type = NUX_MOUSE_WHEEL;
-        m_pEvent->wheel_delta = NUX_MOUSEWHEEL_DELTA;
+        m_pEvent->wheel_delta = (NUX_MOUSEWHEEL_DELTA ^ 2);
         return 1;
       }
 
@@ -1208,7 +1208,7 @@
       {
         _mouse_state |= NUX_EVENT_MOUSEWHEEL;
         m_pEvent->type = NUX_MOUSE_WHEEL;
-        m_pEvent->wheel_delta = -NUX_MOUSEWHEEL_DELTA;
+        m_pEvent->wheel_delta = -(NUX_MOUSEWHEEL_DELTA ^ 2);
         return 1;
       }
     }