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

LibGUI: Convert GToolBar to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-21 16:27:54 +02:00
parent b78225941d
commit f4531c976c
6 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Applications/FileManager/main.cpp
View file

@ -48,8 +48,8 @@ int main(int argc, char** argv)
widget->set_layout(make<GBoxLayout>(Orientation::Vertical)); widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
widget->layout()->set_spacing(0); widget->layout()->set_spacing(0);
auto* main_toolbar = new GToolBar(widget); auto main_toolbar = GToolBar::construct(widget);
auto* location_toolbar = new GToolBar(widget); auto location_toolbar = GToolBar::construct(widget);
location_toolbar->layout()->set_margins({ 6, 3, 6, 3 }); location_toolbar->layout()->set_margins({ 6, 3, 6, 3 });
location_toolbar->set_preferred_size(0, 25); location_toolbar->set_preferred_size(0, 25);

2
Applications/IRCClient/IRCAppWindow.cpp
View file

@ -160,7 +160,7 @@ void IRCAppWindow::setup_widgets()
widget->set_layout(make<GBoxLayout>(Orientation::Vertical)); widget->set_layout(make<GBoxLayout>(Orientation::Vertical));
widget->layout()->set_spacing(0); widget->layout()->set_spacing(0);
auto* toolbar = new GToolBar(widget); auto toolbar = GToolBar::construct(widget);
toolbar->set_has_frame(false); toolbar->set_has_frame(false);
toolbar->add_action(*m_change_nick_action); toolbar->add_action(*m_change_nick_action);
toolbar->add_separator(); toolbar->add_separator();

2
Applications/SystemMonitor/main.cpp
View file

@ -106,7 +106,7 @@ int main(int argc, char** argv)
process_table_container->layout()->set_margins({ 4, 0, 4, 4 }); process_table_container->layout()->set_margins({ 4, 0, 4, 4 });
process_table_container->layout()->set_spacing(0); process_table_container->layout()->set_spacing(0);
auto* toolbar = new GToolBar(process_table_container); auto toolbar = GToolBar::construct(process_table_container);
toolbar->set_has_frame(false); toolbar->set_has_frame(false);
auto* process_table_view = new ProcessTableView(*cpu_graph, process_table_container); auto* process_table_view = new ProcessTableView(*cpu_graph, process_table_container);
auto* memory_stats_widget = new MemoryStatsWidget(*memory_graph, graphs_container); auto* memory_stats_widget = new MemoryStatsWidget(*memory_graph, graphs_container);

2
Applications/TextEditor/TextEditorWidget.cpp
View file

@ -21,7 +21,7 @@ TextEditorWidget::TextEditorWidget()
set_layout(make<GBoxLayout>(Orientation::Vertical)); set_layout(make<GBoxLayout>(Orientation::Vertical));
layout()->set_spacing(0); layout()->set_spacing(0);
auto* toolbar = new GToolBar(this); auto toolbar = GToolBar::construct(this);
m_editor = GTextEditor::construct(GTextEditor::MultiLine, this); m_editor = GTextEditor::construct(GTextEditor::MultiLine, this);
m_editor->set_ruler_visible(true); m_editor->set_ruler_visible(true);
m_editor->set_automatic_indentation_enabled(true); m_editor->set_automatic_indentation_enabled(true);

2
Libraries/LibGUI/GFilePicker.cpp
View file

@ -67,7 +67,7 @@ GFilePicker::GFilePicker(Mode mode, const StringView& file_name, const StringVie
upper_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); upper_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
upper_container->set_preferred_size(0, 26); upper_container->set_preferred_size(0, 26);
auto* toolbar = new GToolBar(upper_container); auto toolbar = GToolBar::construct(upper_container);
toolbar->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill); toolbar->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
toolbar->set_preferred_size(85, 0); toolbar->set_preferred_size(85, 0);
toolbar->set_has_frame(false); toolbar->set_has_frame(false);

6
Libraries/LibGUI/GToolBar.h
View file

@ -8,7 +8,6 @@ class GAction;
class GToolBar : public GWidget { class GToolBar : public GWidget {
C_OBJECT(GToolBar) C_OBJECT(GToolBar)
public: public:
explicit GToolBar(GWidget* parent);
virtual ~GToolBar() override; virtual ~GToolBar() override;
void add_action(GAction&); void add_action(GAction&);
@ -17,9 +16,12 @@ public:
bool has_frame() const { return m_has_frame; } bool has_frame() const { return m_has_frame; }
void set_has_frame(bool has_frame) { m_has_frame = has_frame; } void set_has_frame(bool has_frame) { m_has_frame = has_frame; }
private: protected:
explicit GToolBar(GWidget* parent);
virtual void paint_event(GPaintEvent&) override; virtual void paint_event(GPaintEvent&) override;
private:
struct Item { struct Item {
enum Type { enum Type {
Invalid, Invalid,