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

LibGUI: Don't use Core::Object::add() to instantiate dialogs

Browse source 
Now that add() returns a WidgetType&, we can't rely on the parent of a
GUI::Dialog to still keep it alive after exec() returns. This happens
because exec() will call remove_from_parent() on itself before
returning.

And so we go back to the old idiom for creating a GUI::Dialog centered
above a specific window. Just call GUI::Dialog::construct(), passing
the "parent" window as the last parameter.
This commit is contained in:
Andreas Kling 2020-03-04 20:53:51 +01:00
parent dfa69b82b4
commit b29ff7b821
18 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Libraries/LibGUI/AboutDialog.cpp
View file

@ -33,8 +33,8 @@
namespace GUI {
AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Core::Object* parent)
: Dialog(parent)
AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Window* parent_window)
: Dialog(parent_window)
, m_name(name)
, m_icon(icon)
{

6
Libraries/LibGUI/AboutDialog.h
View file

@ -35,14 +35,14 @@ class AboutDialog final : public Dialog {
public:
virtual ~AboutDialog() override;
static void show(const StringView& name, const Gfx::Bitmap* icon = nullptr, Core::Object* parent = nullptr)
static void show(const StringView& name, const Gfx::Bitmap* icon = nullptr, Window* parent_window = nullptr)
{
auto dialog = AboutDialog::construct(name, icon, parent);
auto dialog = AboutDialog::construct(name, icon, parent_window);
dialog->exec();
}
private:
AboutDialog(const StringView& name, const Gfx::Bitmap* icon = nullptr, Core::Object* parent = nullptr);
AboutDialog(const StringView& name, const Gfx::Bitmap* icon = nullptr, Window* parent_window = nullptr);
String m_name;
RefPtr<Gfx::Bitmap> m_icon;

4
Libraries/LibGUI/ColorPicker.cpp
View file

@ -34,8 +34,8 @@
namespace GUI {
ColorPicker::ColorPicker(Color color, Core::Object* parent)
: Dialog(parent)
ColorPicker::ColorPicker(Color color, Window* parent_window)
: Dialog(parent_window)
, m_color(color)
{
set_title("Edit Color");

2
Libraries/LibGUI/ColorPicker.h
View file

@ -38,7 +38,7 @@ public:
Color color() const { return m_color; }
private:
explicit ColorPicker(Color, Core::Object* parent = nullptr);
explicit ColorPicker(Color, Window* parent_window = nullptr);
void build();

4
Libraries/LibGUI/Dialog.cpp
View file

@ -31,8 +31,8 @@
namespace GUI {
Dialog::Dialog(Core::Object* parent)
: Window(parent)
Dialog::Dialog(Window* parent_window)
: Window(parent_window)
{
set_modal(true);
}

2
Libraries/LibGUI/Dialog.h
View file

@ -53,7 +53,7 @@ public:
virtual void close() override;
protected:
explicit Dialog(Core::Object* parent);
explicit Dialog(Window* parent_window);
private:
OwnPtr<Core::EventLoop> m_event_loop;

4
Libraries/LibGUI/FilePicker.cpp
View file

@ -74,8 +74,8 @@ Optional<String> FilePicker::get_save_filepath(const String& title, const String
return {};
}
FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView& path, Core::Object* parent)
: Dialog(parent)
FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView& path, Window* parent_window)
: Dialog(parent_window)
, m_model(FileSystemModel::create())
, m_mode(mode)
{

2
Libraries/LibGUI/FilePicker.h
View file

@ -52,7 +52,7 @@ private:
void clear_preview();
void on_file_return();
FilePicker(Mode type = Mode::Open, const StringView& file_name = "Untitled", const StringView& path = String(get_current_user_home_path()), Core::Object* parent = nullptr);
FilePicker(Mode type = Mode::Open, const StringView& file_name = "Untitled", const StringView& path = String(get_current_user_home_path()), Window* parent_window = nullptr);
static String ok_button_name(Mode mode)
{

4
Libraries/LibGUI/InputBox.cpp
View file

@ -34,8 +34,8 @@
namespace GUI {
InputBox::InputBox(const StringView& prompt, const StringView& title, Core::Object* parent)
: Dialog(parent)
InputBox::InputBox(const StringView& prompt, const StringView& title, GUI::Window* parent_window)
: Dialog(parent_window)
, m_prompt(prompt)
{
set_title(title);

2
Libraries/LibGUI/InputBox.h
View file

@ -33,7 +33,7 @@ namespace GUI {
class InputBox : public Dialog {
C_OBJECT(InputBox)
public:
explicit InputBox(const StringView& prompt, const StringView& title, Core::Object* parent = nullptr);
explicit InputBox(const StringView& prompt, const StringView& title, Window* parent_window = nullptr);
virtual ~InputBox() override;
String text_value() const { return m_text_value; }

10
Libraries/LibGUI/MessageBox.cpp
View file

@ -33,16 +33,16 @@
namespace GUI {
int MessageBox::show(const StringView& text, const StringView& title, Type type, InputType input_type, Core::Object* parent)
int MessageBox::show(const StringView& text, const StringView& title, Type type, InputType input_type, Window* parent_window)
{
auto box = MessageBox::construct(text, title, type, input_type);
if (parent)
parent->add_child(box);
if (parent_window)
parent_window->add_child(box);
return box->exec();
}
MessageBox::MessageBox(const StringView& text, const StringView& title, Type type, InputType input_type, Core::Object* parent)
: Dialog(parent)
MessageBox::MessageBox(const StringView& text, const StringView& title, Type type, InputType input_type, Window* parent_window)
: Dialog(parent_window)
, m_text(text)
, m_type(type)
, m_input_type(input_type)

4
Libraries/LibGUI/MessageBox.h
View file

@ -49,10 +49,10 @@ public:
virtual ~MessageBox() override;
static int show(const StringView& text, const StringView& title, Type type = Type::None, InputType = InputType::OK, Core::Object* parent = nullptr);
static int show(const StringView& text, const StringView& title, Type type = Type::None, InputType = InputType::OK, Window* parent_window = nullptr);
private:
explicit MessageBox(const StringView& text, const StringView& title, Type type = Type::None, InputType = InputType::OK, Core::Object* parent = nullptr);
explicit MessageBox(const StringView& text, const StringView& title, Type type = Type::None, InputType = InputType::OK, Window* parent_window = nullptr);
bool should_include_ok_button() const;
bool should_include_cancel_button() const;