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

LibGUI: Simplify ToolBarContainer by using shrink-to-fit

Browse source 
This class was implementing shrink-to-fit manually. No need for that
anymore now that we can use Widget's shrink-to-fit mode.
This commit is contained in:
Andreas Kling 2021-01-04 18:21:05 +01:00
parent b03e1b08b5
commit 21bacec13f
2 changed files with 10 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Libraries/LibGUI/ToolBarContainer.cpp
View file

@ -34,57 +34,6 @@ REGISTER_WIDGET(GUI, ToolBarContainer)
namespace GUI { namespace GUI {
void ToolBarContainer::child_event(Core::ChildEvent& event)
{
Frame::child_event(event);
if (event.type() == Core::Event::ChildAdded) {
if (event.child() && is<Widget>(event.child()))
did_add_toolbar((Widget&)*event.child());
} else if (event.type() == Core::Event::ChildRemoved) {
if (event.child() && is<Widget>(event.child())) {
did_remove_toolbar((Widget&)*event.child());
}
}
}
void ToolBarContainer::did_remove_toolbar(Widget& toolbar)
{
m_toolbars.remove_first_matching([&](auto& entry) { return entry.ptr() == &toolbar; });
recompute_preferred_size();
}
void ToolBarContainer::did_add_toolbar(Widget& toolbar)
{
m_toolbars.append(toolbar);
recompute_preferred_size();
}
void ToolBarContainer::custom_layout()
{
recompute_preferred_size();
}
void ToolBarContainer::recompute_preferred_size()
{
int visible_toolbar_count = 0;
int preferred_size = 4;
for (auto& toolbar : m_toolbars) {
if (!toolbar.is_visible())
continue;
++visible_toolbar_count;
preferred_size += toolbar.min_size().secondary_size_for_orientation(m_orientation);
}
preferred_size += (visible_toolbar_count - 1) * 2;
if (m_orientation == Gfx::Orientation::Horizontal)
set_fixed_height(preferred_size);
else
set_fixed_width(preferred_size);
}
ToolBarContainer::ToolBarContainer(Gfx::Orientation orientation) ToolBarContainer::ToolBarContainer(Gfx::Orientation orientation)
: m_orientation(orientation) : m_orientation(orientation)
{ {
@ -97,6 +46,8 @@ ToolBarContainer::ToolBarContainer(Gfx::Orientation orientation)
auto& layout = set_layout<VerticalBoxLayout>(); auto& layout = set_layout<VerticalBoxLayout>();
layout.set_spacing(2); layout.set_spacing(2);
layout.set_margins({ 2, 2, 2, 2 }); layout.set_margins({ 2, 2, 2, 2 });
set_shrink_to_fit(true);
} }
void ToolBarContainer::paint_event(GUI::PaintEvent& event) void ToolBarContainer::paint_event(GUI::PaintEvent& event)
@ -104,13 +55,14 @@ void ToolBarContainer::paint_event(GUI::PaintEvent& event)
Painter painter(*this); Painter painter(*this);
painter.add_clip_rect(event.rect()); painter.add_clip_rect(event.rect());
for (auto& toolbar : m_toolbars) { for_each_child_of_type<ToolBar>([&](auto& toolbar) {
if (!toolbar.is_visible()) if (toolbar.is_visible()) {
continue; auto rect = toolbar.relative_rect();
auto rect = toolbar.relative_rect(); painter.draw_line(rect.top_left().translated(0, -1), rect.top_right().translated(0, -1), palette().threed_highlight());
painter.draw_line(rect.top_left().translated(0, -1), rect.top_right().translated(0, -1), palette().threed_highlight()); painter.draw_line(rect.bottom_left().translated(0, 1), rect.bottom_right().translated(0, 1), palette().threed_shadow1());
painter.draw_line(rect.bottom_left().translated(0, 1), rect.bottom_right().translated(0, 1), palette().threed_shadow1()); }
} return IterationDecision::Continue;
});
Frame::paint_event(event); Frame::paint_event(event);
} }

8
Libraries/LibGUI/ToolBarContainer.h
View file

@ -38,17 +38,9 @@ public:
private: private:
explicit ToolBarContainer(Gfx::Orientation = Gfx::Orientation::Horizontal); explicit ToolBarContainer(Gfx::Orientation = Gfx::Orientation::Horizontal);
virtual void custom_layout() override;
virtual void paint_event(GUI::PaintEvent&) override; virtual void paint_event(GUI::PaintEvent&) override;
virtual void child_event(Core::ChildEvent&) override;
void did_add_toolbar(Widget&);
void did_remove_toolbar(Widget&);
void recompute_preferred_size();
Gfx::Orientation m_orientation { Gfx::Orientation::Horizontal }; Gfx::Orientation m_orientation { Gfx::Orientation::Horizontal };
NonnullRefPtrVector<Widget> m_toolbars;
}; };
} }