summaryrefslogtreecommitdiff
path: root/DevTools/VisualBuilder
diff options
context:
space:
mode:
Diffstat (limited to 'DevTools/VisualBuilder')
-rw-r--r--DevTools/VisualBuilder/VBForm.cpp5
-rw-r--r--DevTools/VisualBuilder/VBForm.h4
-rw-r--r--DevTools/VisualBuilder/VBPropertiesWindow.cpp4
-rw-r--r--DevTools/VisualBuilder/main.cpp20
4 files changed, 17 insertions, 16 deletions
diff --git a/DevTools/VisualBuilder/VBForm.cpp b/DevTools/VisualBuilder/VBForm.cpp
index fad29dfefa..ba105eec84 100644
--- a/DevTools/VisualBuilder/VBForm.cpp
+++ b/DevTools/VisualBuilder/VBForm.cpp
@@ -44,9 +44,8 @@ VBForm* VBForm::current()
return s_current;
}
-VBForm::VBForm(const String& name, GUI::Widget* parent)
- : GUI::Widget(parent)
- , m_name(name)
+VBForm::VBForm(const String& name)
+ : m_name(name)
{
s_current = this;
set_fill_with_background_color(true);
diff --git a/DevTools/VisualBuilder/VBForm.h b/DevTools/VisualBuilder/VBForm.h
index 0aac6f2acd..7aef3c024a 100644
--- a/DevTools/VisualBuilder/VBForm.h
+++ b/DevTools/VisualBuilder/VBForm.h
@@ -33,8 +33,8 @@
class VBForm : public GUI::Widget {
C_OBJECT(VBForm)
friend class VBWidget;
+
public:
- explicit VBForm(const String& name, GUI::Widget* parent = nullptr);
virtual ~VBForm() override;
static VBForm* current();
@@ -66,6 +66,8 @@ protected:
virtual void keydown_event(GUI::KeyEvent&) override;
private:
+ explicit VBForm(const String& name);
+
void grabber_mousedown_event(GUI::MouseEvent&, Direction grabber);
void set_single_selected_widget(VBWidget*);
void add_to_selection(VBWidget&);
diff --git a/DevTools/VisualBuilder/VBPropertiesWindow.cpp b/DevTools/VisualBuilder/VBPropertiesWindow.cpp
index e3721528d5..a5150fb4df 100644
--- a/DevTools/VisualBuilder/VBPropertiesWindow.cpp
+++ b/DevTools/VisualBuilder/VBPropertiesWindow.cpp
@@ -59,7 +59,7 @@ public:
virtual RefPtr<GUI::Widget> create_widget() override
{
- auto combo = GUI::ComboBox::construct(nullptr);
+ auto combo = GUI::ComboBox::construct();
combo->set_only_allow_values_from_model(true);
combo->set_model(adopt(*new BoolValuesModel));
combo->on_return_pressed = [this] { commit(); };
@@ -87,7 +87,7 @@ VBPropertiesWindow::VBPropertiesWindow()
widget->layout()->set_margins({ 2, 2, 2, 2 });
set_main_widget(widget);
- m_table_view = GUI::TableView::construct(widget);
+ m_table_view = widget->add<GUI::TableView>();
m_table_view->set_headers_visible(false);
m_table_view->set_editable(true);
diff --git a/DevTools/VisualBuilder/main.cpp b/DevTools/VisualBuilder/main.cpp
index 098e03c5e4..b06ca890ad 100644
--- a/DevTools/VisualBuilder/main.cpp
+++ b/DevTools/VisualBuilder/main.cpp
@@ -112,7 +112,7 @@ RefPtr<GUI::Window> make_toolbox_window()
widget->layout()->set_spacing(0);
window->set_main_widget(widget);
- auto label_button = GUI::Button::construct(widget);
+ auto label_button = widget->add<GUI::Button>();
label_button->set_button_style(Gfx::ButtonStyle::CoolBar);
label_button->set_tooltip("GLabel");
label_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/label.png"));
@@ -121,7 +121,7 @@ RefPtr<GUI::Window> make_toolbox_window()
form->insert_widget(VBWidgetType::GLabel);
};
- auto button_button = GUI::Button::construct(widget);
+ auto button_button = widget->add<GUI::Button>();
button_button->set_button_style(Gfx::ButtonStyle::CoolBar);
button_button->set_tooltip("GButton");
button_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/button.png"));
@@ -129,7 +129,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GButton);
};
- auto spinbox_button = GUI::Button::construct(widget);
+ auto spinbox_button = widget->add<GUI::Button>();
spinbox_button->set_button_style(Gfx::ButtonStyle::CoolBar);
spinbox_button->set_tooltip("GSpinBox");
spinbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/spinbox.png"));
@@ -137,7 +137,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GSpinBox);
};
- auto editor_button = GUI::Button::construct(widget);
+ auto editor_button = widget->add<GUI::Button>();
editor_button->set_button_style(Gfx::ButtonStyle::CoolBar);
editor_button->set_tooltip("GTextEditor");
editor_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/textbox.png"));
@@ -145,7 +145,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GTextEditor);
};
- auto progress_bar_button = GUI::Button::construct(widget);
+ auto progress_bar_button = widget->add<GUI::Button>();
progress_bar_button->set_button_style(Gfx::ButtonStyle::CoolBar);
progress_bar_button->set_tooltip("GProgressBar");
progress_bar_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/progressbar.png"));
@@ -153,7 +153,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GProgressBar);
};
- auto slider_button = GUI::Button::construct(widget);
+ auto slider_button = widget->add<GUI::Button>();
slider_button->set_button_style(Gfx::ButtonStyle::CoolBar);
slider_button->set_tooltip("GSlider");
slider_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/slider.png"));
@@ -161,7 +161,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GSlider);
};
- auto checkbox_button = GUI::Button::construct(widget);
+ auto checkbox_button = widget->add<GUI::Button>();
checkbox_button->set_button_style(Gfx::ButtonStyle::CoolBar);
checkbox_button->set_tooltip("GCheckBox");
checkbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/checkbox.png"));
@@ -169,7 +169,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GCheckBox);
};
- auto radiobutton_button = GUI::Button::construct(widget);
+ auto radiobutton_button = widget->add<GUI::Button>();
radiobutton_button->set_button_style(Gfx::ButtonStyle::CoolBar);
radiobutton_button->set_tooltip("GRadioButton");
radiobutton_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/filled-radio-circle.png"));
@@ -177,7 +177,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GRadioButton);
};
- auto scrollbar_button = GUI::Button::construct(widget);
+ auto scrollbar_button = widget->add<GUI::Button>();
scrollbar_button->set_button_style(Gfx::ButtonStyle::CoolBar);
scrollbar_button->set_tooltip("GScrollBar");
scrollbar_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/scrollbar.png"));
@@ -185,7 +185,7 @@ RefPtr<GUI::Window> make_toolbox_window()
if (auto* form = VBForm::current())
form->insert_widget(VBWidgetType::GScrollBar);
};
- auto groupbox_button = GUI::Button::construct(widget);
+ auto groupbox_button = widget->add<GUI::Button>();
groupbox_button->set_button_style(Gfx::ButtonStyle::CoolBar);
groupbox_button->set_tooltip("GGroupBox");
groupbox_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/vbwidgets/groupbox.png"));
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:17:57 +0000