RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:17:44 +00:00
Code Issues Activity Actions

LibGUI: Rename {H,V}BoxLayout => {Horizontal,Vertical}BoxLayout

Browse source
This commit is contained in:
Andreas Kling 2020-02-06 14:44:13 +01:00
parent dccf335d5b
commit 799b0a4fa8
49 changed files with 114 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibGUI/GAboutDialog.cpp
View file

@ -44,12 +44,12 @@ AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Core::
auto widget = Widget::construct();
set_main_widget(widget);
widget->set_fill_with_background_color(true);
widget->set_layout(make<HBoxLayout>());
widget->set_layout(make<HorizontalBoxLayout>());
auto left_container = Widget::construct(widget.ptr());
left_container->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
left_container->set_preferred_size(48, 0);
left_container->set_layout(make<VBoxLayout>());
left_container->set_layout(make<VerticalBoxLayout>());
auto icon_label = Label::construct(left_container);
icon_label->set_icon(m_icon);
icon_label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);
@ -57,7 +57,7 @@ AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Core::
left_container->layout()->add_spacer();
auto right_container = Widget::construct(widget.ptr());
right_container->set_layout(make<VBoxLayout>());
right_container->set_layout(make<VerticalBoxLayout>());
right_container->layout()->set_margins({ 0, 4, 4, 4 });
auto make_label = [&](const StringView& text, bool bold = false) {
@ -77,7 +77,7 @@ AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Core::
auto button_container = Widget::construct(right_container.ptr());
button_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
button_container->set_preferred_size(0, 20);
button_container->set_layout(make<HBoxLayout>());
button_container->set_layout(make<HorizontalBoxLayout>());
button_container->layout()->add_spacer();
auto ok_button = Button::construct("OK", button_container);
ok_button->set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed);

12
Libraries/LibGUI/GBoxLayout.h
View file

@ -44,22 +44,22 @@ private:
Orientation m_orientation;
};
class VBoxLayout final : public BoxLayout {
class VerticalBoxLayout final : public BoxLayout {
public:
explicit VBoxLayout()
explicit VerticalBoxLayout()
: BoxLayout(Orientation::Vertical)
{
}
virtual ~VBoxLayout() override {}
virtual ~VerticalBoxLayout() override {}
};
class HBoxLayout final : public BoxLayout {
class HorizontalBoxLayout final : public BoxLayout {
public:
explicit HBoxLayout()
explicit HorizontalBoxLayout()
: BoxLayout(Orientation::Horizontal)
{
}
virtual ~HBoxLayout() override {}
virtual ~HorizontalBoxLayout() override {}
};
}

6
Libraries/LibGUI/GColorPicker.cpp
View file

@ -49,15 +49,15 @@ void ColorPicker::build()
{
auto horizontal_container = Widget::construct();
horizontal_container->set_fill_with_background_color(true);
horizontal_container->set_layout(make<HBoxLayout>());
horizontal_container->set_layout(make<HorizontalBoxLayout>());
horizontal_container->layout()->set_margins({ 4, 4, 4, 4 });
set_main_widget(horizontal_container);
auto left_vertical_container = Widget::construct(horizontal_container.ptr());
left_vertical_container->set_layout(make<VBoxLayout>());
left_vertical_container->set_layout(make<VerticalBoxLayout>());
auto right_vertical_container = Widget::construct(horizontal_container.ptr());
right_vertical_container->set_layout(make<VBoxLayout>());
right_vertical_container->set_layout(make<VerticalBoxLayout>());
enum RGBComponent {
Red,

14
Libraries/LibGUI/GFilePicker.cpp
View file

@ -82,16 +82,16 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
set_rect(200, 200, 700, 400);
auto horizontal_container = Widget::construct();
set_main_widget(horizontal_container);
horizontal_container->set_layout(make<HBoxLayout>());
horizontal_container->set_layout(make<HorizontalBoxLayout>());
horizontal_container->layout()->set_margins({ 4, 4, 4, 4 });
horizontal_container->set_fill_with_background_color(true);
auto vertical_container = Widget::construct(horizontal_container.ptr());
vertical_container->set_layout(make<VBoxLayout>());
vertical_container->set_layout(make<VerticalBoxLayout>());
vertical_container->layout()->set_spacing(4);
auto upper_container = Widget::construct(vertical_container.ptr());
upper_container->set_layout(make<HBoxLayout>());
upper_container->set_layout(make<HorizontalBoxLayout>());
upper_container->layout()->set_spacing(4);
upper_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
upper_container->set_preferred_size(0, 26);
@ -149,7 +149,7 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
toolbar->add_action(*mkdir_action);
auto lower_container = Widget::construct(vertical_container.ptr());
lower_container->set_layout(make<VBoxLayout>());
lower_container->set_layout(make<VerticalBoxLayout>());
lower_container->layout()->set_spacing(4);
lower_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
lower_container->set_preferred_size(0, 60);
@ -157,7 +157,7 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
auto filename_container = Widget::construct(lower_container.ptr());
filename_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
filename_container->set_preferred_size(0, 20);
filename_container->set_layout(make<HBoxLayout>());
filename_container->set_layout(make<HorizontalBoxLayout>());
auto filename_label = Label::construct("File name:", filename_container);
filename_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
filename_label->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
@ -188,7 +188,7 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
auto button_container = Widget::construct(lower_container.ptr());
button_container->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
button_container->set_preferred_size(0, 20);
button_container->set_layout(make<HBoxLayout>());
button_container->set_layout(make<HorizontalBoxLayout>());
button_container->layout()->set_spacing(4);
button_container->layout()->add_spacer();
@ -228,7 +228,7 @@ FilePicker::FilePicker(Mode mode, const StringView& file_name, const StringView&
preview_container->set_frame_shape(Gfx::FrameShape::Container);
preview_container->set_frame_shadow(Gfx::FrameShadow::Sunken);
preview_container->set_frame_thickness(2);
preview_container->set_layout(make<VBoxLayout>());
preview_container->set_layout(make<VerticalBoxLayout>());
preview_container->layout()->set_margins({ 8, 8, 8, 8 });
m_preview_image_label = Label::construct(preview_container);

6
Libraries/LibGUI/GInputBox.cpp
View file

@ -56,7 +56,7 @@ void InputBox::build()
set_rect(x(), y(), max_width + 80, 80);
widget->set_layout(make<VBoxLayout>());
widget->set_layout(make<VerticalBoxLayout>());
widget->set_fill_with_background_color(true);
widget->layout()->set_margins({ 8, 8, 8, 8 });
@ -73,10 +73,10 @@ void InputBox::build()
auto button_container_outer = Widget::construct(widget.ptr());
button_container_outer->set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
button_container_outer->set_preferred_size(0, 20);
button_container_outer->set_layout(make<VBoxLayout>());
button_container_outer->set_layout(make<VerticalBoxLayout>());
auto button_container_inner = Widget::construct(button_container_outer.ptr());
button_container_inner->set_layout(make<HBoxLayout>());
button_container_inner->set_layout(make<HorizontalBoxLayout>());
button_container_inner->layout()->set_spacing(8);
m_cancel_button = Button::construct(button_container_inner);

6
Libraries/LibGUI/GMessageBox.cpp
View file

@ -84,7 +84,7 @@ void MessageBox::build()
int text_width = widget->font().width(m_text);
int icon_width = 0;
widget->set_layout(make<VBoxLayout>());
widget->set_layout(make<VerticalBoxLayout>());
widget->set_fill_with_background_color(true);
widget->layout()->set_margins({ 0, 15, 0, 15 });
@ -93,7 +93,7 @@ void MessageBox::build()
RefPtr<Widget> message_container = widget;
if (m_type != Type::None) {
message_container = Widget::construct(widget.ptr());
message_container->set_layout(make<HBoxLayout>());
message_container->set_layout(make<HorizontalBoxLayout>());
message_container->layout()->set_margins({ 8, 0, 8, 0 });
message_container->layout()->set_spacing(8);
@ -109,7 +109,7 @@ void MessageBox::build()
label->set_preferred_size(text_width, 16);
auto button_container = Widget::construct(widget.ptr());
button_container->set_layout(make<HBoxLayout>());
button_container->set_layout(make<HorizontalBoxLayout>());
button_container->layout()->set_spacing(5);
button_container->layout()->set_margins({ 15, 0, 15, 0 });

2
Libraries/LibGUI/GStatusBar.cpp
View file

@ -43,7 +43,7 @@ StatusBar::StatusBar(int label_count, Widget* parent)
{
set_size_policy(SizePolicy::Fill, SizePolicy::Fixed);
set_preferred_size(0, 20);
set_layout(make<HBoxLayout>());
set_layout(make<HorizontalBoxLayout>());
layout()->set_margins({ 2, 2, 2, 2 });
layout()->set_spacing(2);