Merge lp:~gordallott/nux/enable-mousewheel-in-scrollview into lp:nux

[Gord Allott]

checks for scrollwheel events in scroll view, scrolls accordingly. fixes lp:721447

[lp:~gordallott/nux/enable-mousewheel-in-scrollview]

257. By Gord Allott on 2011-03-04

removed a debug

[Mirco Müller (macslow)]

Since there are all these issues with the project-renaming, we'll leave this for the moment and wait for the "dust to settle".

=== modified file 'Nux/ScrollView.cpp'
--- Nux/ScrollView.cpp	2011-02-28 06:33:08 +0000
+++ Nux/ScrollView.cpp	2011-03-04 16:46:40 +0000
@@ -58,11 +58,14 @@
     setTopBorder (4);
     setBorder (4);
 
+    m_MouseWheelScrollSize = 32;
+
     m_ViewContentLeftMargin      = 0;
     m_ViewContentRightMargin     = 0;
     m_ViewContentTopMargin       = 0;
     m_ViewContentBottomMargin    = 0;
     FormatContent();
+
   }
 
   ScrollView::~ScrollView()
@@ -77,7 +80,6 @@
     long ret = TraverseInfo;
     long ProcEvInfo = 0;
 
-    
     if (event.e_event == NUX_MOUSE_PRESSED)
     {
       // Verify that the mouse down event falls inside the of the ScrollView.
@@ -87,6 +89,20 @@
       }
     }
 
+    if (event.e_event == NUX_MOUSEWHEEL)
+    {
+      // nux can't tell the difference between horizontal and vertical mouse wheel events
+      // so we are only going to support vertical
+      if (event.e_wheeldelta > 0)
+      {
+        ScrollDown (abs (event.e_wheeldelta / NUX_MOUSEWHEEL_DELTA), m_MouseWheelScrollSize);
+      }
+      else
+      {
+        ScrollUp (abs (event.e_wheeldelta / NUX_MOUSEWHEEL_DELTA), m_MouseWheelScrollSize);
+      }
+    }
+
     if (m_vertical_scrollbar_enable)
       ret = vscrollbar->ProcessEvent (event, ret, ProcEvInfo);
 
@@ -116,6 +132,8 @@
       ret = m_CompositionLayout->ProcessEvent (mod_event, ret, ProcEvInfo);
     }
 
+
+
     ret = PostProcessEvent2 (event, ret, 0);
     return ret;
   }
@@ -833,7 +851,7 @@
       _delta_x = 0;
     }
 
-    
+
 
     hscrollbar->SetContentOffset (_delta_x, _delta_y);
     hscrollbar->NeedRedraw();

=== modified file 'Nux/ScrollView.h'
--- Nux/ScrollView.h	2011-02-23 14:14:29 +0000
+++ Nux/ScrollView.h	2011-03-04 16:46:40 +0000
@@ -84,6 +84,8 @@
     virtual void ResetScrollToUp();
     virtual void ResetScrollToDown();
 
+    // amount to scroll by for each mouse wheel event
+    int m_MouseWheelScrollSize;
 
     // Geometry of the layout that encompass the child layouts.
     //! X Position of the content
@@ -197,7 +199,6 @@
     //! Vertical scrollbar offsets.
     int _delta_y;
 
-
     void FormatContent ();
     virtual void PreLayoutManagement ();
     virtual long PostLayoutManagement (long LayoutResult);
@@ -219,4 +220,4 @@
   };
 }
 
-#endif // SCROLLVIEW_H
\ No newline at end of file
+#endif // SCROLLVIEW_H