RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00
Code Issues Activity Actions

LibWeb: Simplify LayoutWidget layout

Browse source 
Set the intrinsic size up front and let LayoutReplaced do the work.
This commit is contained in:
Andreas Kling 2020-06-05 21:50:03 +02:00
parent 83cda9e79e
commit 11f2c59219
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Libraries/LibWeb/Layout/LayoutWidget.cpp
View file

@ -40,6 +40,10 @@ LayoutWidget::LayoutWidget(const Element& element, GUI::Widget& widget)
: LayoutReplaced(element, StyleProperties::create()) : LayoutReplaced(element, StyleProperties::create())
, m_widget(widget) , m_widget(widget)
{ {
set_has_intrinsic_width(true);
set_has_intrinsic_height(true);
set_intrinsic_width(widget.width());
set_intrinsic_height(widget.height());
} }
LayoutWidget::~LayoutWidget() LayoutWidget::~LayoutWidget()
@ -47,16 +51,6 @@ LayoutWidget::~LayoutWidget()
widget().remove_from_parent(); widget().remove_from_parent();
} }
void LayoutWidget::layout(LayoutMode layout_mode)
{
set_has_intrinsic_width(true);
set_has_intrinsic_height(true);
set_intrinsic_width(widget().width());
set_intrinsic_height(widget().height());
LayoutReplaced::layout(layout_mode);
}
void LayoutWidget::did_set_rect() void LayoutWidget::did_set_rect()
{ {
LayoutReplaced::did_set_rect(); LayoutReplaced::did_set_rect();

1
Libraries/LibWeb/Layout/LayoutWidget.h
View file

@ -35,7 +35,6 @@ public:
LayoutWidget(const Element&, GUI::Widget&); LayoutWidget(const Element&, GUI::Widget&);
virtual ~LayoutWidget() override; virtual ~LayoutWidget() override;
virtual void layout(LayoutMode = LayoutMode::Default) override;
virtual void render(RenderingContext&) override; virtual void render(RenderingContext&) override;
GUI::Widget& widget() { return m_widget; } GUI::Widget& widget() { return m_widget; }