RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:48:10 +00:00
Code Issues Activity Actions

LibGUI: Margins for AbstractScrollableWidget

Browse source 
Implement, and use internally, content_margins() from Widget.
Since AbstractScrollableWidget already has a method called content_size,
the convenience method, with the same name, in Widget has to be
explicitly called.
This commit is contained in:
FrHun 2021-09-19 00:45:42 +02:00 • committed by Andreas Kling
parent a4eeb6f9eb
commit dab7ec190e
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibGUI/AbstractScrollableWidget.cpp
View file

@ -93,8 +93,9 @@ void AbstractScrollableWidget::resize_event(ResizeEvent& event)
Gfx::IntSize AbstractScrollableWidget::available_size() const
{
unsigned available_width = max(frame_inner_rect().width() - m_size_occupied_by_fixed_elements.width() - width_occupied_by_vertical_scrollbar(), 0);
unsigned available_height = max(frame_inner_rect().height() - m_size_occupied_by_fixed_elements.height() - height_occupied_by_horizontal_scrollbar(), 0);
auto inner_size = Widget::content_size();
unsigned available_width = max(inner_size.width() - m_size_occupied_by_fixed_elements.width(), 0);
unsigned available_height = max(inner_size.height() - m_size_occupied_by_fixed_elements.height(), 0);
return { available_width, available_height };
}
@ -159,13 +160,19 @@ int AbstractScrollableWidget::width_occupied_by_vertical_scrollbar() const
return m_vertical_scrollbar->is_visible() ? m_vertical_scrollbar->width() : 0;
}
Margins AbstractScrollableWidget::content_margins() const
{
return Frame::content_margins() + Margins { 0, width_occupied_by_vertical_scrollbar(), height_occupied_by_horizontal_scrollbar(), 0 };
}
Gfx::IntRect AbstractScrollableWidget::visible_content_rect() const
{
auto inner_size = Widget::content_size();
Gfx::IntRect rect {
m_horizontal_scrollbar->value(),
m_vertical_scrollbar->value(),
min(m_content_size.width(), frame_inner_rect().width() - width_occupied_by_vertical_scrollbar() - m_size_occupied_by_fixed_elements.width()),
min(m_content_size.height(), frame_inner_rect().height() - height_occupied_by_horizontal_scrollbar() - m_size_occupied_by_fixed_elements.height())
min(m_content_size.width(), inner_size.width() - m_size_occupied_by_fixed_elements.width()),
min(m_content_size.height(), inner_size.height() - m_size_occupied_by_fixed_elements.height())
};
if (rect.is_empty())
return {};