1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-19 00:25:07 +00:00

Ladybird+LibWebView: Migrate scrolling changes to LibWebView callbacks

This commit is contained in:
Timothy Flynn 2023-08-23 10:57:09 -04:00 committed by Tim Flynn
parent 00fe122b0a
commit 78d9339aa9
10 changed files with 73 additions and 98 deletions

View file

@ -89,6 +89,26 @@ WebContentView::WebContentView(StringView webdriver_content_ipc_path, WebView::E
viewport()->update();
};
on_scroll_by_delta = [this](auto x_delta, auto y_delta) {
horizontalScrollBar()->setValue(max(0, horizontalScrollBar()->value() + x_delta));
verticalScrollBar()->setValue(max(0, verticalScrollBar()->value() + y_delta));
};
on_scroll_to_point = [this](auto position) {
horizontalScrollBar()->setValue(position.x());
verticalScrollBar()->setValue(position.y());
};
on_scroll_into_view = [this](auto rect) {
if (m_viewport_rect.contains(rect))
return;
if (rect.top() < m_viewport_rect.top())
verticalScrollBar()->setValue(rect.top());
else if (rect.top() > m_viewport_rect.top() && rect.bottom() > m_viewport_rect.bottom())
verticalScrollBar()->setValue(rect.bottom() - m_viewport_rect.height());
};
on_cursor_change = [this](auto cursor) {
update_cursor(cursor);
};
@ -667,29 +687,6 @@ void WebContentView::update_cursor(Gfx::StandardCursor cursor)
}
}
void WebContentView::notify_server_did_request_scroll(Badge<WebContentClient>, i32 x_delta, i32 y_delta)
{
horizontalScrollBar()->setValue(max(0, horizontalScrollBar()->value() + x_delta));
verticalScrollBar()->setValue(max(0, verticalScrollBar()->value() + y_delta));
}
void WebContentView::notify_server_did_request_scroll_to(Badge<WebContentClient>, Gfx::IntPoint scroll_position)
{
horizontalScrollBar()->setValue(scroll_position.x());
verticalScrollBar()->setValue(scroll_position.y());
}
void WebContentView::notify_server_did_request_scroll_into_view(Badge<WebContentClient>, Gfx::IntRect const& rect)
{
if (m_viewport_rect.contains(rect))
return;
if (rect.top() < m_viewport_rect.top())
verticalScrollBar()->setValue(rect.top());
else if (rect.top() > m_viewport_rect.top() && rect.bottom() > m_viewport_rect.bottom())
verticalScrollBar()->setValue(rect.bottom() - m_viewport_rect.height());
}
void WebContentView::notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint content_position, DeprecatedString const& tooltip)
{
auto widget_position = to_widget_position(content_position);