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

Userland: Specify margins and spacing in the GUI::Layout constructor

Browse source
This commit is contained in:
Sam Atkins 2023-02-16 21:07:06 +00:00 • committed by Sam Atkins
parent 9561ec15f4
commit 77ad0fdb07
64 changed files with 136 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Services/Taskbar/ClockWidget.cpp
View file

@ -43,15 +43,12 @@ ClockWidget::ClockWidget()
auto root_container = m_calendar_window->set_main_widget<GUI::Frame>().release_value_but_fixme_should_propagate_errors();
root_container->set_fill_with_background_color(true);
root_container->set_layout<GUI::VerticalBoxLayout>();
root_container->layout()->set_margins({ 2, 0 });
root_container->layout()->set_spacing(0);
root_container->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 2, 0 }, 0);
root_container->set_frame_shape(Gfx::FrameShape::Window);
auto& navigation_container = root_container->add<GUI::Widget>();
navigation_container.set_fixed_height(24);
navigation_container.set_layout<GUI::HorizontalBoxLayout>();
navigation_container.layout()->set_margins({ 2 });
navigation_container.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 2 });
m_prev_date = navigation_container.add<GUI::Button>();
m_prev_date->set_button_style(Gfx::ButtonStyle::Coolbar);
@ -114,8 +111,7 @@ ClockWidget::ClockWidget()
separator1.set_fixed_height(2);
auto& calendar_container = root_container->add<GUI::Widget>();
calendar_container.set_layout<GUI::HorizontalBoxLayout>();
calendar_container.layout()->set_margins({ 2 });
calendar_container.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 2 });
m_calendar = calendar_container.add<GUI::Calendar>();
m_selected_calendar_button->set_text(m_calendar->formatted_date().release_value_but_fixme_should_propagate_errors());
@ -133,8 +129,7 @@ ClockWidget::ClockWidget()
auto& settings_container = root_container->add<GUI::Widget>();
settings_container.set_fixed_height(24);
settings_container.set_layout<GUI::HorizontalBoxLayout>();
settings_container.layout()->set_margins({ 2 });
settings_container.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 2 });
settings_container.add_spacer().release_value_but_fixme_should_propagate_errors();
m_jump_to_button = settings_container.add<GUI::Button>();

3
Userland/Services/Taskbar/QuickLaunchWidget.cpp
View file

@ -105,8 +105,7 @@ ErrorOr<NonnullRefPtr<QuickLaunchWidget>> QuickLaunchWidget::create()
QuickLaunchWidget::QuickLaunchWidget()
{
set_shrink_to_fit(true);
set_layout<GUI::HorizontalBoxLayout>();
layout()->set_spacing(0);
set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 0);
set_frame_thickness(0);
set_fixed_height(24);
}

14
Userland/Services/Taskbar/ShutdownDialog.cpp
View file

@ -44,8 +44,7 @@ ShutdownDialog::ShutdownDialog()
{
auto widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors();
widget->set_fill_with_background_color(true);
widget->set_layout<GUI::VerticalBoxLayout>();
widget->layout()->set_spacing(0);
widget->set_layout<GUI::VerticalBoxLayout>(GUI::Margins {}, 0);
auto& banner_image = widget->add<GUI::ImageWidget>();
banner_image.load_from_file("/res/graphics/brand-banner.png"sv);
@ -55,8 +54,7 @@ ShutdownDialog::ShutdownDialog()
auto& left_container = content_container.add<GUI::Widget>();
left_container.set_fixed_width(60);
left_container.set_layout<GUI::VerticalBoxLayout>();
left_container.layout()->set_margins({ 12, 0, 0 });
left_container.set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 12, 0, 0 });
auto& icon_wrapper = left_container.add<GUI::Widget>();
icon_wrapper.set_fixed_size(32, 48);
@ -66,8 +64,7 @@ ShutdownDialog::ShutdownDialog()
icon_image.set_bitmap(Gfx::Bitmap::load_from_file("/res/icons/32x32/shutdown.png"sv).release_value_but_fixme_should_propagate_errors());
auto& right_container = content_container.add<GUI::Widget>();
right_container.set_layout<GUI::VerticalBoxLayout>();
right_container.layout()->set_margins({ 12, 12, 8, 0 });
right_container.set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 12, 12, 8, 0 });
auto& label = right_container.add<GUI::Label>("What would you like to do?");
label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
@ -90,12 +87,11 @@ ShutdownDialog::ShutdownDialog()
}
}
right_container.layout()->add_spacer();
right_container.add_spacer().release_value_but_fixme_should_propagate_errors();
auto& button_container = right_container.add<GUI::Widget>();
button_container.set_fixed_height(23);
button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container.layout()->set_spacing(5);
button_container.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 5);
button_container.add_spacer().release_value_but_fixme_should_propagate_errors();
auto& ok_button = button_container.add<GUI::Button>(String::from_utf8_short_string("OK"sv));
ok_button.set_fixed_size(80, 23);

6
Userland/Services/Taskbar/TaskbarWindow.cpp
View file

@ -73,15 +73,13 @@ TaskbarWindow::TaskbarWindow()
ErrorOr<void> TaskbarWindow::populate_taskbar()
{
auto main_widget = TRY(set_main_widget<TaskbarWidget>());
(void)TRY(main_widget->try_set_layout<GUI::HorizontalBoxLayout>());
main_widget->layout()->set_margins({ 2, 3, 0, 3 });
(void)TRY(main_widget->try_set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 2, 3, 0, 3 }));
m_quick_launch = TRY(Taskbar::QuickLaunchWidget::create());
TRY(main_widget->try_add_child(*m_quick_launch));
m_task_button_container = TRY(main_widget->try_add<GUI::Widget>());
(void)TRY(m_task_button_container->try_set_layout<GUI::HorizontalBoxLayout>());
m_task_button_container->layout()->set_spacing(3);
(void)TRY(m_task_button_container->try_set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 3));
m_default_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png"sv));