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

LibGUI+Userland: Convert MessageBox to fallible construction

Browse source 
Adds fallible versions of MessageBox's helper factories, ports
DeprecatedString, and rewrites build() to be both fallible and
more responsive to font changes.

MessageBox now auto shrinks and no longer has to re-build its
layout when text changes. It is manually resized once at
creation to position properly as a Dialog before being shown.
This commit is contained in:
thankyouverycool 2023-04-14 08:52:09 -04:00 • committed by Andreas Kling
parent aa94b944de
commit c9404c3a63
4 changed files with 92 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibGUI/MessageBox.h
View file

@ -13,7 +13,7 @@
namespace GUI {
class MessageBox : public Dialog {
C_OBJECT(MessageBox)
C_OBJECT_ABSTRACT(MessageBox)
public:
enum class Type {
None,
@ -36,19 +36,25 @@ public:
static ExecResult show_error(Window* parent_window, StringView text);
static ExecResult ask_about_unsaved_changes(Window* parent_window, StringView path, Optional<Time> last_unmodified_timestamp = {});
void set_text(DeprecatedString text);
static ErrorOr<ExecResult> try_show(Window* parent_window, StringView text, StringView title, Type type = Type::None, InputType input_type = InputType::OK);
static ErrorOr<ExecResult> try_show_error(Window* parent_window, StringView text);
static ErrorOr<ExecResult> try_ask_about_unsaved_changes(Window* parent_window, StringView path, Optional<Time> last_unmodified_timestamp = {});
static ErrorOr<NonnullRefPtr<MessageBox>> create(Window* parent_window, StringView text, StringView title, Type type = Type::None, InputType input_type = InputType::OK);
void set_text(String);
private:
explicit MessageBox(Window* parent_window, StringView text, StringView title, Type type = Type::None, InputType input_type = InputType::OK);
MessageBox(Window* parent_window, Type type = Type::None, InputType input_type = InputType::OK);
bool should_include_ok_button() const;
bool should_include_cancel_button() const;
bool should_include_yes_button() const;
bool should_include_no_button() const;
void build();
RefPtr<Gfx::Bitmap> icon() const;
DeprecatedString m_text;
ErrorOr<void> build();
ErrorOr<RefPtr<Gfx::Bitmap>> icon() const;
Type m_type { Type::None };
InputType m_input_type { InputType::OK };
@ -56,6 +62,7 @@ private:
RefPtr<GUI::Button> m_yes_button;
RefPtr<GUI::Button> m_no_button;
RefPtr<GUI::Button> m_cancel_button;
RefPtr<Label> m_text_label;
};
}