mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 22:57:35 +00:00
LibGUI: Rewrite layout system in terms of min and max sizes
This patch removes size policies and preferred sizes, and replaces them
with min-size and max-size for each widget.
Box layout now works in 3 passes:
1) Set all items (widgets/spacers) to their min-size
2) Distribute remaining space evenly, respecting max-size
3) Place widgets one after the other, adding spacing in between
I've also added convenience helpers for setting a fixed size (which is
the same as setting min-size and max-size to the same value.)
This significantly reduces the verbosity of widget layout and makes GML
a bit more pleasant to write, too. :^)
This commit is contained in:
Andreas Kling
parent
b2bba5ce5c
commit
7dc5a3ead8
83 changed files with 444 additions and 957 deletions
|
|
@ -101,26 +101,22 @@ void DisplaySettingsWidget::create_frame()
|
|||
/// Wallpaper Preview /////////////////////////////////////////////////////////////////////////
|
||||
|
||||
m_monitor_widget = settings_content.add<MonitorWidget>();
|
||||
m_monitor_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
|
||||
m_monitor_widget->set_preferred_size(338, 248);
|
||||
m_monitor_widget->set_fixed_size(338, 248);
|
||||
|
||||
/// Wallpaper Row /////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
auto& wallpaper_selection_container = settings_content.add<GUI::Widget>();
|
||||
wallpaper_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
wallpaper_selection_container.layout()->set_margins({ 0, 4, 0, 0 });
|
||||
wallpaper_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
wallpaper_selection_container.set_preferred_size(0, 22);
|
||||
wallpaper_selection_container.set_fixed_height(22);
|
||||
|
||||
auto& wallpaper_label = wallpaper_selection_container.add<GUI::Label>();
|
||||
wallpaper_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
wallpaper_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
wallpaper_label.set_preferred_size({ 70, 0 });
|
||||
wallpaper_label.set_fixed_width(70);
|
||||
wallpaper_label.set_text("Wallpaper:");
|
||||
|
||||
m_wallpaper_combo = wallpaper_selection_container.add<GUI::ComboBox>();
|
||||
m_wallpaper_combo->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_wallpaper_combo->set_preferred_size(0, 22);
|
||||
m_wallpaper_combo->set_fixed_height(22);
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(true);
|
||||
m_wallpaper_combo->set_model(*GUI::ItemListModel<AK::String>::create(m_wallpapers));
|
||||
m_wallpaper_combo->on_change = [this](auto& text, const GUI::ModelIndex& index) {
|
||||
|
|
@ -149,8 +145,7 @@ void DisplaySettingsWidget::create_frame()
|
|||
button.set_tooltip("Select Wallpaper from file system.");
|
||||
button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"));
|
||||
button.set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
|
||||
button.set_preferred_size(22, 22);
|
||||
button.set_fixed_size(22, 22);
|
||||
button.on_click = [this](auto) {
|
||||
Optional<String> open_path = GUI::FilePicker::get_open_filepath(root_widget()->window(), "Select wallpaper from file system.");
|
||||
|
||||
|
|
@ -167,18 +162,15 @@ void DisplaySettingsWidget::create_frame()
|
|||
auto& mode_selection_container = settings_content.add<GUI::Widget>();
|
||||
mode_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
mode_selection_container.layout()->set_margins({ 0, 4, 0, 0 });
|
||||
mode_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
mode_selection_container.set_preferred_size(0, 22);
|
||||
mode_selection_container.set_fixed_height(22);
|
||||
|
||||
auto& mode_label = mode_selection_container.add<GUI::Label>();
|
||||
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
mode_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
mode_label.set_preferred_size({ 70, 0 });
|
||||
mode_label.set_fixed_width(70);
|
||||
mode_label.set_text("Mode:");
|
||||
|
||||
m_mode_combo = mode_selection_container.add<GUI::ComboBox>();
|
||||
m_mode_combo->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_mode_combo->set_preferred_size(0, 22);
|
||||
m_mode_combo->set_fixed_height(22);
|
||||
m_mode_combo->set_only_allow_values_from_model(true);
|
||||
m_mode_combo->set_model(*GUI::ItemListModel<AK::String>::create(m_modes));
|
||||
m_mode_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
|
||||
|
|
@ -190,18 +182,15 @@ void DisplaySettingsWidget::create_frame()
|
|||
|
||||
auto& resolution_selection_container = settings_content.add<GUI::Widget>();
|
||||
resolution_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
resolution_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
resolution_selection_container.set_preferred_size(0, 22);
|
||||
resolution_selection_container.set_fixed_height(22);
|
||||
|
||||
auto& m_resolution_label = resolution_selection_container.add<GUI::Label>();
|
||||
m_resolution_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
m_resolution_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
m_resolution_label.set_preferred_size({ 70, 0 });
|
||||
m_resolution_label.set_fixed_width(70);
|
||||
m_resolution_label.set_text("Resolution:");
|
||||
|
||||
m_resolution_combo = resolution_selection_container.add<GUI::ComboBox>();
|
||||
m_resolution_combo->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_resolution_combo->set_preferred_size(0, 22);
|
||||
m_resolution_combo->set_fixed_height(22);
|
||||
m_resolution_combo->set_only_allow_values_from_model(true);
|
||||
m_resolution_combo->set_model(*GUI::ItemListModel<Gfx::IntSize>::create(m_resolutions));
|
||||
m_resolution_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
|
||||
|
|
@ -213,19 +202,16 @@ void DisplaySettingsWidget::create_frame()
|
|||
|
||||
auto& color_selection_container = settings_content.add<GUI::Widget>();
|
||||
color_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
color_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
color_selection_container.set_preferred_size(0, 22);
|
||||
color_selection_container.set_fixed_height(22);
|
||||
|
||||
auto& color_label = color_selection_container.add<GUI::Label>();
|
||||
color_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
color_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
color_label.set_preferred_size({ 70, 0 });
|
||||
color_label.set_fixed_width(70);
|
||||
color_label.set_text("Color:");
|
||||
|
||||
m_color_input = color_selection_container.add<GUI::ColorInput>();
|
||||
m_color_input->set_color_has_alpha_channel(false);
|
||||
m_color_input->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
m_color_input->set_preferred_size(90, 0);
|
||||
m_color_input->set_fixed_width(90);
|
||||
m_color_input->set_color_picker_title("Select color for desktop");
|
||||
m_color_input->on_change = [this] {
|
||||
m_monitor_widget->set_background_color(m_color_input->color());
|
||||
|
|
@ -237,14 +223,11 @@ void DisplaySettingsWidget::create_frame()
|
|||
auto& bottom_widget = settings_content.add<GUI::Widget>();
|
||||
bottom_widget.set_layout<GUI::HorizontalBoxLayout>();
|
||||
bottom_widget.layout()->add_spacer();
|
||||
//bottom_widget.layout()->set_margins({ 4, 10, 4, 10 });
|
||||
bottom_widget.set_size_policy(Orientation::Vertical, GUI::SizePolicy::Fixed);
|
||||
bottom_widget.set_preferred_size(1, 22);
|
||||
bottom_widget.set_fixed_height(22);
|
||||
|
||||
auto& ok_button = bottom_widget.add<GUI::Button>();
|
||||
ok_button.set_text("OK");
|
||||
ok_button.set_size_policy(Orientation::Horizontal, GUI::SizePolicy::Fixed);
|
||||
ok_button.set_preferred_size(60, 22);
|
||||
ok_button.set_fixed_size(60, 22);
|
||||
ok_button.on_click = [this](auto) {
|
||||
send_settings_to_window_server();
|
||||
GUI::Application::the()->quit();
|
||||
|
|
@ -252,16 +235,14 @@ void DisplaySettingsWidget::create_frame()
|
|||
|
||||
auto& cancel_button = bottom_widget.add<GUI::Button>();
|
||||
cancel_button.set_text("Cancel");
|
||||
cancel_button.set_size_policy(Orientation::Horizontal, GUI::SizePolicy::Fixed);
|
||||
cancel_button.set_preferred_size(60, 22);
|
||||
cancel_button.set_fixed_size(60, 22);
|
||||
cancel_button.on_click = [](auto) {
|
||||
GUI::Application::the()->quit();
|
||||
};
|
||||
|
||||
auto& apply_button = bottom_widget.add<GUI::Button>();
|
||||
apply_button.set_text("Apply");
|
||||
apply_button.set_size_policy(Orientation::Horizontal, GUI::SizePolicy::Fixed);
|
||||
apply_button.set_preferred_size(60, 22);
|
||||
apply_button.set_fixed_size(60, 22);
|
||||
apply_button.on_click = [this](auto) {
|
||||
send_settings_to_window_server();
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue