Filter out scrolling envents for FilterExpanderLabel.

Fixes LP: #1604632 (bzr r4168.2.1)

2 files changed, 9 insertions, 0 deletions

diff --git a/dash/FilterExpanderLabel.cpp b/dash/FilterExpanderLabel.cpp
index b6dd20b86..0137297e5 100644
--- a/dash/FilterExpanderLabel.cpp
+++ b/dash/FilterExpanderLabel.cpp
@@ -273,6 +273,14 @@ void FilterExpanderLabel::DrawContent(nux::GraphicsEngine& graphics_engine, bool
 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
 //
diff --git a/dash/FilterExpanderLabel.h b/dash/FilterExpanderLabel.h
index 52f672788..3afbaf817 100644
--- a/dash/FilterExpanderLabel.h
+++ b/dash/FilterExpanderLabel.h
@@ -69,6 +69,7 @@ public:
 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);