RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:48:12 +00:00
Code Issues Activity Actions

LibGUI: Convert GGroupBox to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-21 16:13:04 +02:00
parent 4f4438c04c
commit 83b5f6c11a
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Applications/SystemMonitor/NetworkStatisticsWidget.cpp
View file

@ -12,7 +12,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget(GWidget* parent)
set_fill_with_background_color(true); set_fill_with_background_color(true);
set_background_color(Color::WarmGray); set_background_color(Color::WarmGray);
auto* adapters_group_box = new GGroupBox("Adapters", this); auto adapters_group_box = GGroupBox::construct("Adapters", this);
adapters_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical)); adapters_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical));
adapters_group_box->layout()->set_margins({ 6, 16, 6, 6 }); adapters_group_box->layout()->set_margins({ 6, 16, 6, 6 });
adapters_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); adapters_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
@ -32,7 +32,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget(GWidget* parent)
net_adapters_fields.empend("bytes_out", "Bytes Out", TextAlignment::CenterRight); net_adapters_fields.empend("bytes_out", "Bytes Out", TextAlignment::CenterRight);
m_adapter_table_view->set_model(GJsonArrayModel::create("/proc/net/adapters", move(net_adapters_fields))); m_adapter_table_view->set_model(GJsonArrayModel::create("/proc/net/adapters", move(net_adapters_fields)));
auto* sockets_group_box = new GGroupBox("Sockets", this); auto sockets_group_box = GGroupBox::construct("Sockets", this);
sockets_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical)); sockets_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical));
sockets_group_box->layout()->set_margins({ 6, 16, 6, 6 }); sockets_group_box->layout()->set_margins({ 6, 16, 6, 6 });
sockets_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fill); sockets_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fill);

4
Applications/SystemMonitor/main.cpp
View file

@ -66,7 +66,7 @@ int main(int argc, char** argv)
graphs_container->set_layout(make<GBoxLayout>(Orientation::Vertical)); graphs_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
graphs_container->layout()->set_margins({ 4, 4, 4, 4 }); graphs_container->layout()->set_margins({ 4, 4, 4, 4 });
auto* cpu_graph_group_box = new GGroupBox("CPU usage", graphs_container); auto cpu_graph_group_box = GGroupBox::construct("CPU usage", graphs_container);
cpu_graph_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical)); cpu_graph_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical));
cpu_graph_group_box->layout()->set_margins({ 6, 16, 6, 6 }); cpu_graph_group_box->layout()->set_margins({ 6, 16, 6, 6 });
cpu_graph_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); cpu_graph_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
@ -79,7 +79,7 @@ int main(int argc, char** argv)
return String::format("%d%%", value); return String::format("%d%%", value);
}; };
auto* memory_graph_group_box = new GGroupBox("Memory usage", graphs_container); auto memory_graph_group_box = GGroupBox::construct("Memory usage", graphs_container);
memory_graph_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical)); memory_graph_group_box->set_layout(make<GBoxLayout>(Orientation::Vertical));
memory_graph_group_box->layout()->set_margins({ 6, 16, 6, 6 }); memory_graph_group_box->layout()->set_margins({ 6, 16, 6, 6 });
memory_graph_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed); memory_graph_group_box->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);

4
Applications/Terminal/main.cpp
View file

@ -100,7 +100,7 @@ GWindow* create_settings_window(TerminalWidget& terminal, RefPtr<CConfigFile> co
settings->set_layout(make<GBoxLayout>(Orientation::Vertical)); settings->set_layout(make<GBoxLayout>(Orientation::Vertical));
settings->layout()->set_margins({ 4, 4, 4, 4 }); settings->layout()->set_margins({ 4, 4, 4, 4 });
auto* radio_container = new GGroupBox("Bell Mode", settings); auto radio_container = GGroupBox::construct("Bell Mode", settings);
radio_container->set_layout(make<GBoxLayout>(Orientation::Vertical)); radio_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
radio_container->layout()->set_margins({ 6, 16, 6, 6 }); radio_container->layout()->set_margins({ 6, 16, 6, 6 });
radio_container->set_fill_with_background_color(true); radio_container->set_fill_with_background_color(true);
@ -115,7 +115,7 @@ GWindow* create_settings_window(TerminalWidget& terminal, RefPtr<CConfigFile> co
terminal.set_should_beep(checked); terminal.set_should_beep(checked);
}; };
auto* slider_container = new GGroupBox("Background Opacity", settings); auto slider_container = GGroupBox::construct("Background Opacity", settings);
slider_container->set_layout(make<GBoxLayout>(Orientation::Vertical)); slider_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
slider_container->layout()->set_margins({ 6, 16, 6, 6 }); slider_container->layout()->set_margins({ 6, 16, 6, 6 });
slider_container->set_fill_with_background_color(true); slider_container->set_fill_with_background_color(true);

2
DevTools/VisualBuilder/VBWidgetRegistry.cpp
View file

@ -76,7 +76,7 @@ static GWidget* build_gwidget(VBWidgetType type, GWidget* parent)
case VBWidgetType::GScrollBar: case VBWidgetType::GScrollBar:
return GScrollBar::construct(Orientation::Vertical, parent); return GScrollBar::construct(Orientation::Vertical, parent);
case VBWidgetType::GGroupBox: case VBWidgetType::GGroupBox:
return new GGroupBox("groupbox_1", parent); return GGroupBox::construct("groupbox_1", parent);
case VBWidgetType::GLabel: { case VBWidgetType::GLabel: {
auto label = GLabel::construct(parent); auto label = GLabel::construct(parent);
label->set_fill_with_background_color(true); label->set_fill_with_background_color(true);

5
Libraries/LibGUI/GGroupBox.h
View file

@ -5,14 +5,15 @@
class GGroupBox : public GWidget { class GGroupBox : public GWidget {
C_OBJECT(GGroupBox) C_OBJECT(GGroupBox)
public: public:
explicit GGroupBox(GWidget* parent);
GGroupBox(const StringView& title, GWidget* parent);
virtual ~GGroupBox() override; virtual ~GGroupBox() override;
String title() const { return m_title; } String title() const { return m_title; }
void set_title(const StringView&); void set_title(const StringView&);
protected: protected:
explicit GGroupBox(GWidget* parent);
GGroupBox(const StringView& title, GWidget* parent);
virtual void paint_event(GPaintEvent&) override; virtual void paint_event(GPaintEvent&) override;
private: private: