Merge lp:~azzar1/unity/fix-scrolling-filter-expand into lp:unity

[Andrea Azzarone]

Filter out scrolling envents for FilterExpanderLabel.

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

Thanks... Wondering why the SetMouseWheel nux function doesn't work here, but this is fine anyway.

review: Approve

=== modified file 'dash/FilterExpanderLabel.cpp'
--- dash/FilterExpanderLabel.cpp	2015-05-08 04:24:43 +0000
+++ dash/FilterExpanderLabel.cpp	2016-08-17 09:51:31 +0000
@@ -273,6 +273,14 @@
   graphics_engine.PopClippingRectangle();
 }
 
+nux::Area* FilterExpanderLabel::FindAreaUnderMouse(const nux::Point& mouse_position, nux::NuxEventType event_type)
+{
+  if (event_type == nux::EVENT_MOUSE_WHEEL)
+    return nullptr;
+  else
+    return nux::View::FindAreaUnderMouse(mouse_position, event_type);
+}
+
 //
 // Key navigation
 //

=== modified file 'dash/FilterExpanderLabel.h'
--- dash/FilterExpanderLabel.h	2015-05-05 02:03:52 +0000
+++ dash/FilterExpanderLabel.h	2016-08-17 09:51:31 +0000
@@ -69,6 +69,7 @@
   nux::Property<bool> expanded;
 
 protected:
+  nux::Area* FindAreaUnderMouse(const nux::Point&, nux::NuxEventType) override;
   virtual bool AcceptKeyNavFocus();
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);