@@ -863,7 +863,7 @@ bool Context::ProcessMouseWheel(Vector2f wheel_delta, int key_modifier_state)
else
scroll_controller->ActivateSmoothscroll(target, scroll_length, ScrollBehavior::Auto);
- return false;
+ return target == nullptr;
}
bool Context::ProcessMouseLeave()
@@ -1997,10 +1997,8 @@ Element* Element::GetClosestScrollableContainer()
scrollable_x = (scrollable_x && GetScrollWidth() > GetClientWidth());
scrollable_y = (scrollable_y && GetScrollHeight() > GetClientHeight());
- if (scrollable_x || scrollable_y)
+ if (scrollable_x || scrollable_y || meta->computed_values.overscroll_behavior() == OverscrollBehavior::Contain)
return this;
- else if (meta->computed_values.overscroll_behavior() == OverscrollBehavior::Contain)
- return nullptr;
else if (parent)
return parent->GetClosestScrollableContainer();