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

LibGUI: Convert GWidget to ObjectPtr

Browse source
This commit is contained in:
Andreas Kling 2019-09-21 17:05:35 +02:00
parent e4e92980a1
commit ff6ce422dd
41 changed files with 115 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Applications/PaintBrush/ColorDialog.cpp
View file

@ -19,16 +19,16 @@ ColorDialog::~ColorDialog()
void ColorDialog::build()
{
auto* horizontal_container = new GWidget;
auto horizontal_container = GWidget::construct();
horizontal_container->set_fill_with_background_color(true);
horizontal_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
horizontal_container->layout()->set_margins({ 4, 4, 4, 4 });
set_main_widget(horizontal_container);
auto* left_vertical_container = new GWidget(horizontal_container);
auto left_vertical_container = GWidget::construct(horizontal_container);
left_vertical_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
auto* right_vertical_container = new GWidget(horizontal_container);
auto right_vertical_container = GWidget::construct(horizontal_container);
right_vertical_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
enum RGBComponent {

6
Applications/PaintBrush/PaletteWidget.cpp
View file

@ -81,16 +81,16 @@ PaletteWidget::PaletteWidget(PaintableWidget& paintable_widget, GWidget* parent)
set_secondary_color(color);
};
auto* color_container = new GWidget(this);
auto color_container = GWidget::construct(this);
color_container->set_relative_rect(m_secondary_color_widget->relative_rect().right() + 2, 2, 500, 32);
color_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
color_container->layout()->set_spacing(1);
auto* top_color_container = new GWidget(color_container);
auto top_color_container = GWidget::construct(color_container);
top_color_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
top_color_container->layout()->set_spacing(1);
auto* bottom_color_container = new GWidget(color_container);
auto bottom_color_container = GWidget::construct(color_container);
bottom_color_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
bottom_color_container->layout()->set_spacing(1);

4
Applications/PaintBrush/main.cpp
View file

@ -19,14 +19,14 @@ int main(int argc, char** argv)
window->set_title("PaintBrush");
window->set_rect(100, 100, 640, 480);
auto* horizontal_container = new GWidget(nullptr);
auto horizontal_container = GWidget::construct(nullptr);
window->set_main_widget(horizontal_container);
horizontal_container->set_layout(make<GBoxLayout>(Orientation::Horizontal));
horizontal_container->layout()->set_spacing(0);
new ToolboxWidget(horizontal_container);
auto* vertical_container = new GWidget(horizontal_container);
auto vertical_container = GWidget::construct(horizontal_container);
vertical_container->set_layout(make<GBoxLayout>(Orientation::Vertical));
vertical_container->layout()->set_spacing(0);