RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:17:44 +00:00
Code Issues Activity Actions

LibGUI+FileManager: Clarify Widget margins name

Browse source 
Even though they are called content_margins,
they are actually only ever used to determine where
a Widget is supposed to be grabbable.
So all methods and members are renamed accordingly.
This commit is contained in:
FrHun 2021-09-14 21:08:57 +02:00 • committed by Andreas Kling
parent a261e4d9d5
commit 8249ea792e
7 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibGUI/Widget.cpp
View file

@ -657,7 +657,7 @@ Widget* Widget::child_at(const Gfx::IntPoint& point) const
auto& child = verify_cast<Widget>(children()[i]);
if (!child.is_visible())
continue;
if (child.content_rect().contains(point))
if (child.relative_non_grabbable_rect().contains(point))
return const_cast<Widget*>(&child);
}
return nullptr;
@ -999,20 +999,20 @@ void Widget::did_end_inspection()
update();
}
void Widget::set_content_margins(const Margins& margins)
void Widget::set_grabbable_margins(const Margins& margins)
{
if (m_content_margins == margins)
if (m_grabbable_margins == margins)
return;
m_content_margins = margins;
m_grabbable_margins = margins;
invalidate_layout();
}
Gfx::IntRect Widget::content_rect() const
Gfx::IntRect Widget::relative_non_grabbable_rect() const
{
auto rect = relative_rect();
rect.translate_by(m_content_margins.left(), m_content_margins.top());
rect.set_width(rect.width() - (m_content_margins.left() + m_content_margins.right()));
rect.set_height(rect.height() - (m_content_margins.top() + m_content_margins.bottom()));
rect.translate_by(m_grabbable_margins.left(), m_grabbable_margins.top());
rect.set_width(rect.width() - (m_grabbable_margins.left() + m_grabbable_margins.right()));
rect.set_height(rect.height() - (m_grabbable_margins.top() + m_grabbable_margins.bottom()));
return rect;
}