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

LibGUI: Remove remaining fallible Layout APIs

Browse source
This commit is contained in:
Andreas Kling 2023-08-14 06:47:48 +02:00
parent 58e482a06d
commit b679094529
2 changed files with 17 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Userland/Libraries/LibGUI/Layout.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2023, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers. * Copyright (c) 2022, the SerenityOS developers.
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
@ -60,17 +60,11 @@ void Layout::notify_disowned(Badge<Widget>, Widget& widget)
m_entries.clear(); m_entries.clear();
} }
ErrorOr<void> Layout::try_add_entry(Entry&& entry)
{
TRY(m_entries.try_append(move(entry)));
if (m_owner)
m_owner->notify_layout_changed({});
return {};
}
void Layout::add_entry(Entry&& entry) void Layout::add_entry(Entry&& entry)
{ {
MUST(try_add_entry(move(entry))); m_entries.append(move(entry));
if (m_owner)
m_owner->notify_layout_changed({});
} }
void Layout::add_spacer() void Layout::add_spacer()
@ -86,36 +80,24 @@ void Layout::add_layout(OwnPtr<Layout>&& layout)
add_entry(move(entry)); add_entry(move(entry));
} }
ErrorOr<void> Layout::try_add_widget(Widget& widget)
{
TRY(try_add_entry(Entry {
.type = Entry::Type::Widget,
.widget = widget,
}));
return {};
}
void Layout::add_widget(Widget& widget) void Layout::add_widget(Widget& widget)
{ {
MUST(try_add_widget(widget)); add_entry(Entry {
} .type = Entry::Type::Widget,
.widget = widget,
ErrorOr<void> Layout::try_insert_widget_before(Widget& widget, Widget& before_widget) });
{
Entry entry;
entry.type = Entry::Type::Widget;
entry.widget = widget;
TRY(m_entries.try_insert_before_matching(move(entry), [&](auto& existing_entry) {
return existing_entry.type == Entry::Type::Widget && existing_entry.widget.ptr() == &before_widget;
}));
if (m_owner)
m_owner->notify_layout_changed({});
return {};
} }
void Layout::insert_widget_before(Widget& widget, Widget& before_widget) void Layout::insert_widget_before(Widget& widget, Widget& before_widget)
{ {
MUST(try_insert_widget_before(widget, before_widget)); Entry entry;
entry.type = Entry::Type::Widget;
entry.widget = widget;
m_entries.insert_before_matching(move(entry), [&](auto& existing_entry) {
return existing_entry.type == Entry::Type::Widget && existing_entry.widget.ptr() == &before_widget;
});
if (m_owner)
m_owner->notify_layout_changed({});
} }
void Layout::remove_widget(Widget& widget) void Layout::remove_widget(Widget& widget)

6
Userland/Libraries/LibGUI/Layout.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2023, Andreas Kling <kling@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -38,9 +38,6 @@ public:
void add_layout(OwnPtr<Layout>&&); void add_layout(OwnPtr<Layout>&&);
void add_spacer(); void add_spacer();
ErrorOr<void> try_add_widget(Widget&);
ErrorOr<void> try_insert_widget_before(Widget& widget, Widget& before_widget);
void remove_widget(Widget&); void remove_widget(Widget&);
virtual void run(Widget&) = 0; virtual void run(Widget&) = 0;
@ -73,7 +70,6 @@ protected:
OwnPtr<Layout> layout {}; OwnPtr<Layout> layout {};
}; };
void add_entry(Entry&&); void add_entry(Entry&&);
ErrorOr<void> try_add_entry(Entry&&);
WeakPtr<Widget> m_owner; WeakPtr<Widget> m_owner;
Vector<Entry> m_entries; Vector<Entry> m_entries;