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

LibGUI: Add GUI::Toolbar::try_add_action()

Browse source 
This is a fallible variant of add_action() that returns ErrorOr.
It's careful to not fail with a partially added action.
This commit is contained in:
Andreas Kling 2021-11-24 13:18:52 +01:00
parent 47b6339025
commit 9b07e13fb6
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Userland/Libraries/LibGUI/Toolbar.cpp
View file

@ -88,19 +88,29 @@ private:
} }
}; };
GUI::Button& Toolbar::add_action(Action& action) ErrorOr<NonnullRefPtr<GUI::Button>> Toolbar::try_add_action(Action& action)
{ {
auto item = make<Item>(); auto item = TRY(adopt_nonnull_own_or_enomem(new (nothrow) Item));
item->type = Item::Type::Action; item->type = Item::Type::Action;
item->action = action; item->action = action;
auto& button = add<ToolbarButton>(action); // NOTE: Grow the m_items capacity before potentially adding a child widget.
button.set_fixed_size(m_button_size + 8, m_button_size + 8); // This avoids having to untangle the child widget in case of allocation failure.
TRY(m_items.try_ensure_capacity(m_items.size() + 1));
m_items.append(move(item)); auto button = TRY(try_add<ToolbarButton>(action));
button->set_fixed_size(m_button_size + 8, m_button_size + 8);
m_items.unchecked_append(move(item));
return button; return button;
} }
GUI::Button& Toolbar::add_action(Action& action)
{
auto button = MUST(try_add_action(action));
return *button;
}
void Toolbar::add_separator() void Toolbar::add_separator()
{ {
auto item = make<Item>(); auto item = make<Item>();

2
Userland/Libraries/LibGUI/Toolbar.h
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
#include <AK/NonnullOwnPtrVector.h> #include <AK/NonnullOwnPtrVector.h>
#include <LibGUI/Button.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
namespace GUI { namespace GUI {
@ -16,6 +17,7 @@ class Toolbar : public Widget {
public: public:
virtual ~Toolbar() override; virtual ~Toolbar() override;
ErrorOr<NonnullRefPtr<GUI::Button>> try_add_action(GUI::Action&);
GUI::Button& add_action(GUI::Action&); GUI::Button& add_action(GUI::Action&);
void add_separator(); void add_separator();