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

LibGUI: Convert GTextBox, GTextEditor and GResizeCorner to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-21 15:43:52 +02:00
parent 4ea229accd
commit 93851c3832
25 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibGUI/GComboBox.cpp
View file

@ -9,7 +9,7 @@
GComboBox::GComboBox(GWidget* parent)
: GWidget(parent)
{
m_editor = new GTextEditor(GTextEditor::Type::SingleLine, this);
m_editor = GTextEditor::construct(GTextEditor::Type::SingleLine, this);
m_editor->on_change = [this] {
if (on_change)
on_change(m_editor->text(), m_list_view->selection().first());

2
Libraries/LibGUI/GComboBox.h
View file

@ -36,7 +36,7 @@ protected:
virtual void resize_event(GResizeEvent&) override;
private:
GTextEditor* m_editor { nullptr };
ObjectPtr<GTextEditor> m_editor;
GButton* m_open_button { nullptr };
GWindow* m_list_window { nullptr };
GListView* m_list_view { nullptr };

4
Libraries/LibGUI/GFilePicker.cpp
View file

@ -72,7 +72,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
toolbar->set_preferred_size(85, 0);
toolbar->set_has_frame(false);
auto* location_textbox = new GTextBox(upper_container);
auto location_textbox = GTextBox::construct(upper_container);
location_textbox->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
location_textbox->set_preferred_size(0, 20);
@ -132,7 +132,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
filename_label->set_text_alignment(TextAlignment::CenterLeft);
filename_label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
filename_label->set_preferred_size(60, 0);
m_filename_textbox = new GTextBox(filename_container);
m_filename_textbox = GTextBox::construct(filename_container);
if (m_mode == Mode::Save) {
m_filename_textbox->set_text(file_name);
m_filename_textbox->set_focus(true);

2
Libraries/LibGUI/GFilePicker.h
View file

@ -46,7 +46,7 @@ private:
NonnullRefPtr<GDirectoryModel> m_model;
FileSystemPath m_selected_file;
GTextBox* m_filename_textbox { nullptr };
ObjectPtr<GTextBox> m_filename_textbox;
ObjectPtr<GLabel> m_preview_image_label;
ObjectPtr<GLabel> m_preview_name_label;
ObjectPtr<GLabel> m_preview_geometry_label;

2
Libraries/LibGUI/GInputBox.cpp
View file

@ -38,7 +38,7 @@ void GInputBox::build()
label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);
label->set_preferred_size(text_width, 16);
m_text_editor = new GTextEditor(GTextEditor::SingleLine, widget);
m_text_editor = GTextEditor::construct(GTextEditor::SingleLine, widget);
m_text_editor->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
m_text_editor->set_preferred_size(0, 19);

2
Libraries/LibGUI/GInputBox.h
View file

@ -20,5 +20,5 @@ private:
GButton* m_ok_button { nullptr };
GButton* m_cancel_button { nullptr };
GTextEditor* m_text_editor { nullptr };
ObjectPtr<GTextEditor> m_text_editor;
};

10
Libraries/LibGUI/GModelEditingDelegate.h
View file

@ -15,7 +15,7 @@ public:
return;
m_model = model;
m_index = index;
m_widget = create_widget()->make_weak_ptr();
m_widget = create_widget();
}
GWidget* widget() { return m_widget; }
@ -29,7 +29,7 @@ public:
virtual void will_begin_editing() { }
protected:
virtual GWidget* create_widget() = 0;
virtual ObjectPtr<GWidget> create_widget() = 0;
void commit()
{
if (on_commit)
@ -39,7 +39,7 @@ protected:
private:
RefPtr<GModel> m_model;
GModelIndex m_index;
WeakPtr<GWidget> m_widget;
ObjectPtr<GWidget> m_widget;
};
class GStringModelEditingDelegate : public GModelEditingDelegate {
@ -47,9 +47,9 @@ public:
GStringModelEditingDelegate() {}
virtual ~GStringModelEditingDelegate() override {}
virtual GWidget* create_widget() override
virtual ObjectPtr<GWidget> create_widget() override
{
auto* textbox = new GTextBox(nullptr);
auto textbox = GTextBox::construct(nullptr);
textbox->on_return_pressed = [this] {
commit();
};

3
Libraries/LibGUI/GResizeCorner.h
View file

@ -3,10 +3,11 @@
class GResizeCorner : public GWidget {
C_OBJECT(GResizeCorner)
public:
explicit GResizeCorner(GWidget* parent);
virtual ~GResizeCorner() override;
protected:
explicit GResizeCorner(GWidget* parent);
virtual void paint_event(GPaintEvent&) override;
virtual void mousedown_event(GMouseEvent&) override;
virtual void enter_event(CEvent&) override;

2
Libraries/LibGUI/GSpinBox.cpp
View file

@ -5,7 +5,7 @@
GSpinBox::GSpinBox(GWidget* parent)
: GWidget(parent)
{
m_editor = new GTextEditor(GTextEditor::Type::SingleLine, this);
m_editor = GTextEditor::construct(GTextEditor::Type::SingleLine, this);
m_editor->set_text("0");
m_editor->on_change = [this] {
bool ok;

2
Libraries/LibGUI/GSpinBox.h
View file

@ -26,7 +26,7 @@ protected:
virtual void resize_event(GResizeEvent&) override;
private:
GTextEditor* m_editor { nullptr };
ObjectPtr<GTextEditor> m_editor;
GButton* m_increment_button { nullptr };
GButton* m_decrement_button { nullptr };

2
Libraries/LibGUI/GStatusBar.cpp
View file

@ -19,7 +19,7 @@ GStatusBar::GStatusBar(GWidget* parent)
m_label->set_frame_thickness(1);
m_label->set_text_alignment(TextAlignment::CenterLeft);
m_corner = new GResizeCorner(this);
m_corner = GResizeCorner::construct(this);
}
GStatusBar::~GStatusBar()

2
Libraries/LibGUI/GStatusBar.h
View file

@ -18,5 +18,5 @@ private:
virtual void paint_event(GPaintEvent&) override;
ObjectPtr<GLabel> m_label;
GResizeCorner* m_corner { nullptr };
ObjectPtr<GResizeCorner> m_corner;
};

7
Libraries/LibGUI/GTextEditor.h
View file

@ -93,7 +93,6 @@ public:
MultiLine,
SingleLine
};
GTextEditor(Type, GWidget* parent);
virtual ~GTextEditor() override;
bool is_readonly() const { return m_readonly; }
@ -166,9 +165,9 @@ public:
void add_custom_context_menu_action(GAction&);
protected:
virtual void did_change_font() override;
GTextEditor(Type, GWidget* parent);
private:
virtual void did_change_font() override;
virtual void paint_event(GPaintEvent&) override;
virtual void mousedown_event(GMouseEvent&) override;
virtual void mouseup_event(GMouseEvent&) override;
@ -184,6 +183,8 @@ private:
virtual void context_menu_event(GContextMenuEvent&) override;
virtual void resize_event(GResizeEvent&) override;
private:
void create_actions();
void paint_ruler(Painter&);
void update_content_size();