Filter out scrolling envents for FilterExpanderLabel. (LP: #1604632)

Approved by: Marco Trevisan (Treviño)
kyegupov · Aug 17, 2016 · 6fc4daf · 6fc4daf
2 parents 42caeae + 5bd7c95
commit 6fc4daf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -69,6 +69,7 @@ class FilterExpanderLabel : public nux::View,  public debug::Introspectable
   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);