From 7dc5a3ead86627d11b1bf8d243750e5e3390c067 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 30 Dec 2020 01:23:32 +0100 Subject: [PATCH] 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. :^) --- Applications/Browser/BookmarksBarWidget.cpp | 9 +- Applications/Browser/ConsoleWidget.cpp | 6 +- Applications/Browser/DownloadWidget.cpp | 21 +- Applications/Browser/Tab.cpp | 6 +- Applications/Calendar/AddEventDialog.cpp | 27 +-- Applications/Calendar/main.cpp | 3 +- .../CrashReporter/CrashReporterWindow.gml | 31 +-- .../DisplaySettings/DisplaySettings.cpp | 55 ++--- .../FileManager/FileManagerWindow.gml | 6 +- Applications/FileManager/PropertiesDialog.cpp | 33 +-- Applications/FontEditor/FontEditor.cpp | 105 +++------ Applications/Help/main.cpp | 6 +- Applications/IRCClient/IRCAppWindow.cpp | 3 +- Applications/IRCClient/IRCWindow.cpp | 6 +- .../KeyboardMapper/KeyboardMapperWidget.cpp | 10 +- Applications/KeyboardSettings/main.cpp | 21 +- Applications/Piano/KnobsWidget.cpp | 6 +- Applications/Piano/MainWidget.cpp | 12 +- Applications/Piano/SamplerWidget.cpp | 9 +- Applications/PixelPaint/BrushTool.cpp | 18 +- Applications/PixelPaint/BucketTool.cpp | 9 +- Applications/PixelPaint/FilterParams.h | 1 - .../PixelPaint/LayerPropertiesWidget.cpp | 21 +- Applications/PixelPaint/PaletteWidget.cpp | 3 +- Applications/PixelPaint/PenTool.cpp | 9 +- Applications/PixelPaint/SprayTool.cpp | 18 +- Applications/PixelPaint/ToolboxWidget.cpp | 6 +- Applications/PixelPaint/main.cpp | 3 +- .../SoundPlayer/SoundPlayerWidget.cpp | 13 +- Applications/Spreadsheet/CellTypeDialog.cpp | 48 ++-- Applications/Spreadsheet/CondFormatting.gml | 17 +- Applications/Spreadsheet/CondView.gml | 37 +-- Applications/Spreadsheet/HelpWindow.cpp | 3 +- .../Spreadsheet/SpreadsheetWidget.cpp | 10 +- Applications/Terminal/main.cpp | 30 +-- Applications/TextEditor/TextEditorWidget.cpp | 3 +- Applications/TextEditor/TextEditorWindow.gml | 32 +-- Applications/ThemeEditor/main.cpp | 6 +- Applications/Welcome/TextWidget.cpp | 3 +- Applications/Welcome/main.cpp | 22 +- Demos/DynamicObject/main.cpp | 3 +- Demos/HelloWorld/main.cpp | 3 +- Demos/WidgetGallery/main.cpp | 65 +---- .../HackStudio/Debugger/DisassemblyWidget.cpp | 4 +- DevTools/HackStudio/EditorWrapper.cpp | 9 +- DevTools/HackStudio/FindInFilesWidget.cpp | 7 +- DevTools/HackStudio/Git/GitWidget.cpp | 12 +- DevTools/HackStudio/HackStudioWidget.cpp | 22 +- DevTools/HackStudio/Locator.cpp | 3 +- DevTools/Inspector/main.cpp | 3 +- DevTools/Profiler/ProfileTimelineWidget.cpp | 3 +- DevTools/Profiler/main.cpp | 3 +- Games/Minesweeper/Field.cpp | 4 +- Games/Minesweeper/main.cpp | 8 +- Libraries/LibGUI/AboutDialog.cpp | 16 +- Libraries/LibGUI/AbstractTableView.cpp | 4 +- Libraries/LibGUI/BoxLayout.cpp | 223 +++++++----------- Libraries/LibGUI/BreadcrumbBar.cpp | 4 +- Libraries/LibGUI/Calendar.cpp | 3 +- Libraries/LibGUI/ColorPicker.cpp | 44 +--- Libraries/LibGUI/FilePicker.cpp | 38 +-- Libraries/LibGUI/HeaderView.cpp | 6 +- Libraries/LibGUI/ImageWidget.cpp | 5 +- Libraries/LibGUI/InputBox.cpp | 16 +- Libraries/LibGUI/Label.cpp | 3 +- Libraries/LibGUI/MessageBox.cpp | 9 +- Libraries/LibGUI/ProcessChooser.cpp | 9 +- Libraries/LibGUI/ResizeCorner.cpp | 3 +- Libraries/LibGUI/ScrollBar.cpp | 4 +- Libraries/LibGUI/ScrollableWidget.cpp | 12 +- Libraries/LibGUI/Splitter.cpp | 11 +- Libraries/LibGUI/StatusBar.cpp | 3 +- Libraries/LibGUI/ToolBar.cpp | 12 +- Libraries/LibGUI/ToolBarContainer.cpp | 14 +- Libraries/LibGUI/Widget.cpp | 30 --- Libraries/LibGUI/Widget.h | 20 -- Libraries/LibGUI/Window.cpp | 8 +- Libraries/LibVT/TerminalWidget.cpp | 3 +- MenuApplets/Audio/main.cpp | 8 +- MenuApplets/Clock/main.cpp | 37 +-- .../NotificationServer/NotificationWindow.cpp | 3 +- Services/SystemMenu/ShutdownDialog.cpp | 3 +- Services/Taskbar/TaskbarWindow.cpp | 14 +- 83 files changed, 444 insertions(+), 957 deletions(-) diff --git a/Applications/Browser/BookmarksBarWidget.cpp b/Applications/Browser/BookmarksBarWidget.cpp index de616336f4..ef9af48a60 100644 --- a/Applications/Browser/BookmarksBarWidget.cpp +++ b/Applications/Browser/BookmarksBarWidget.cpp @@ -51,8 +51,7 @@ BookmarksBarWidget::BookmarksBarWidget(const String& bookmarks_file, bool enable set_layout(); layout()->set_spacing(0); - set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - set_preferred_size(0, 20); + set_fixed_height(20); if (!enabled) set_visible(false); @@ -60,8 +59,7 @@ BookmarksBarWidget::BookmarksBarWidget(const String& bookmarks_file, bool enable m_additional = GUI::Button::construct(); m_additional->set_button_style(Gfx::ButtonStyle::CoolBar); m_additional->set_text(">"); - m_additional->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_additional->set_preferred_size(14, 20); + m_additional->set_fixed_size(14, 20); m_additional->set_focus_policy(GUI::FocusPolicy::TabFocus); m_additional->on_click = [this](auto) { if (m_additional_menu) { @@ -134,9 +132,8 @@ void BookmarksBarWidget::model_did_update(unsigned) button.set_button_style(Gfx::ButtonStyle::CoolBar); button.set_text(title); - button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-html.png")); - button.set_preferred_size(font().width(title) + 32, 20); + button.set_fixed_size(font().width(title) + 32, 20); button.set_relative_rect(rect); button.set_focus_policy(GUI::FocusPolicy::TabFocus); button.set_tooltip(url); diff --git a/Applications/Browser/ConsoleWidget.cpp b/Applications/Browser/ConsoleWidget.cpp index 52ced262b8..826b0a50a5 100644 --- a/Applications/Browser/ConsoleWidget.cpp +++ b/Applications/Browser/ConsoleWidget.cpp @@ -62,8 +62,7 @@ ConsoleWidget::ConsoleWidget() auto& bottom_container = add(); bottom_container.set_layout(); - bottom_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - bottom_container.set_preferred_size(0, 22); + bottom_container.set_fixed_height(22); m_input = bottom_container.add(); m_input->set_syntax_highlighter(make()); @@ -112,8 +111,7 @@ ConsoleWidget::ConsoleWidget() set_focus_proxy(m_input); auto& clear_button = bottom_container.add(); - clear_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - clear_button.set_preferred_size(22, 22); + clear_button.set_fixed_size(22, 22); clear_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png")); clear_button.set_tooltip("Clear the console output"); clear_button.on_click = [this](auto) { diff --git a/Applications/Browser/DownloadWidget.cpp b/Applications/Browser/DownloadWidget.cpp index 2eaa2ded26..9441e15a80 100644 --- a/Applications/Browser/DownloadWidget.cpp +++ b/Applications/Browser/DownloadWidget.cpp @@ -70,8 +70,7 @@ DownloadWidget::DownloadWidget(const URL& url) layout.set_margins({ 4, 4, 4, 4 }); auto& animation_container = add(); - animation_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - animation_container.set_preferred_size(0, 32); + animation_container.set_fixed_height(32); auto& animation_layout = animation_container.set_layout(); auto& browser_image = animation_container.add(); @@ -80,29 +79,24 @@ DownloadWidget::DownloadWidget(const URL& url) auto& source_label = add(String::formatted("From: {}", url)); source_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - source_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - source_label.set_preferred_size(0, 16); + source_label.set_fixed_height(16); m_progress_bar = add(); - m_progress_bar->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_progress_bar->set_preferred_size(0, 20); + m_progress_bar->set_fixed_height(20); m_progress_label = add(); m_progress_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - m_progress_label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_progress_label->set_preferred_size(0, 16); + m_progress_label->set_fixed_height(16); auto& destination_label = add(String::formatted("To: {}", m_destination_path)); destination_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - destination_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - destination_label.set_preferred_size(0, 16); + destination_label.set_fixed_height(16); auto& button_container = add(); auto& button_container_layout = button_container.set_layout(); button_container_layout.add_spacer(); m_cancel_button = button_container.add("Cancel"); - m_cancel_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_cancel_button->set_preferred_size(100, 22); + m_cancel_button->set_fixed_size(100, 22); m_cancel_button->on_click = [this](auto) { bool success = m_download->stop(); ASSERT(success); @@ -111,8 +105,7 @@ DownloadWidget::DownloadWidget(const URL& url) m_close_button = button_container.add("OK"); m_close_button->set_enabled(false); - m_close_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_close_button->set_preferred_size(100, 22); + m_close_button->set_fixed_size(100, 22); m_close_button->on_click = [this](auto) { window()->close(); }; diff --git a/Applications/Browser/Tab.cpp b/Applications/Browser/Tab.cpp index 5a0608f258..aebb7948b0 100644 --- a/Applications/Browser/Tab.cpp +++ b/Applications/Browser/Tab.cpp @@ -112,8 +112,7 @@ Tab::Tab(Type type) toolbar.add_action(*m_reload_action); m_location_box = toolbar.add(); - m_location_box->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_location_box->set_preferred_size(0, 22); + m_location_box->set_fixed_height(22); m_location_box->set_placeholder("Address"); m_location_box->on_return_pressed = [this] { @@ -130,8 +129,7 @@ Tab::Tab(Type type) m_bookmark_button = toolbar.add(); m_bookmark_button->set_button_style(Gfx::ButtonStyle::CoolBar); m_bookmark_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/bookmark-contour.png")); - m_bookmark_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_bookmark_button->set_preferred_size(22, 22); + m_bookmark_button->set_fixed_size(22, 22); m_bookmark_button->on_click = [this](auto) { auto url = this->url().to_string(); diff --git a/Applications/Calendar/AddEventDialog.cpp b/Applications/Calendar/AddEventDialog.cpp index e6703ce635..c3a427c9c1 100644 --- a/Applications/Calendar/AddEventDialog.cpp +++ b/Applications/Calendar/AddEventDialog.cpp @@ -59,55 +59,46 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, Window* parent_window) auto& top_container = widget.add(); top_container.set_layout(); - top_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - top_container.set_preferred_size(0, 45); + top_container.set_fixed_height(45); top_container.layout()->set_margins({ 4, 4, 4, 4 }); auto& add_label = top_container.add("Add title & date:"); add_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - add_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - add_label.set_preferred_size(0, 14); + add_label.set_fixed_height(14); add_label.set_font(Gfx::Font::default_bold_font()); auto& event_title_textbox = top_container.add(); - event_title_textbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - event_title_textbox.set_preferred_size(0, 20); + event_title_textbox.set_fixed_height(20); auto& middle_container = widget.add(); middle_container.set_layout(); - middle_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - middle_container.set_preferred_size(0, 25); + middle_container.set_fixed_height(25); middle_container.layout()->set_margins({ 4, 4, 4, 4 }); auto& starting_month_combo = middle_container.add(); starting_month_combo.set_only_allow_values_from_model(true); - starting_month_combo.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - starting_month_combo.set_preferred_size(50, 20); + starting_month_combo.set_fixed_size(50, 20); starting_month_combo.set_model(MonthListModel::create()); starting_month_combo.set_selected_index(m_date_time.month() - 1); auto& starting_day_combo = middle_container.add(); - starting_day_combo.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - starting_day_combo.set_preferred_size(40, 20); + starting_day_combo.set_fixed_size(40, 20); starting_day_combo.set_value(m_date_time.day()); starting_day_combo.set_min(1); auto& starting_year_combo = middle_container.add(); - starting_year_combo.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - starting_year_combo.set_preferred_size(55, 20); + starting_year_combo.set_fixed_size(55, 20); starting_year_combo.set_range(0, 9999); starting_year_combo.set_value(m_date_time.year()); widget.layout()->add_spacer(); auto& button_container = widget.add(); - button_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - button_container.set_preferred_size(0, 20); + button_container.set_fixed_height(20); button_container.set_layout(); button_container.layout()->add_spacer(); auto& ok_button = button_container.add("OK"); - ok_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - ok_button.set_preferred_size(80, 20); + ok_button.set_fixed_size(80, 20); ok_button.on_click = [this](auto) { dbgln("TODO: Add event icon on specific tile"); done(Dialog::ExecOK); diff --git a/Applications/Calendar/main.cpp b/Applications/Calendar/main.cpp index fef03594fd..81840c4fe4 100644 --- a/Applications/Calendar/main.cpp +++ b/Applications/Calendar/main.cpp @@ -134,8 +134,7 @@ int main(int argc, char** argv) toolbar.add_action(prev_date_action); selected_calendar_button = toolbar.add(calendar_widget.selected_calendar_text()); - selected_calendar_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - selected_calendar_button->set_preferred_size(70, 0); + selected_calendar_button->set_fixed_width(70); selected_calendar_button->set_button_style(Gfx::ButtonStyle::CoolBar); selected_calendar_button->set_font(Gfx::Font::default_bold_fixed_width_font()); selected_calendar_button->on_click = [&](auto) { diff --git a/Applications/CrashReporter/CrashReporterWindow.gml b/Applications/CrashReporter/CrashReporterWindow.gml index 7d4f6bc54e..acca32bd13 100644 --- a/Applications/CrashReporter/CrashReporterWindow.gml +++ b/Applications/CrashReporter/CrashReporterWindow.gml @@ -6,8 +6,7 @@ } @GUI::Widget { - vertical_size_policy: "Fixed" - preferred_height: 44 + fixed_height: 44 layout: @GUI::HorizontalBoxLayout { spacing: 10 @@ -24,8 +23,7 @@ } @GUI::Widget { - vertical_size_policy: "Fixed" - preferred_height: 18 + fixed_height: 18 layout: @GUI::HorizontalBoxLayout { } @@ -33,8 +31,7 @@ @GUI::Label { text: "Executable path:" text_alignment: "CenterLeft" - horizontal_size_policy: "Fixed" - preferred_width: 90 + fixed_width: 90 } @GUI::LinkLabel { @@ -44,8 +41,7 @@ } @GUI::Widget { - vertical_size_policy: "Fixed" - preferred_height: 18 + fixed_height: 18 layout: @GUI::HorizontalBoxLayout { } @@ -53,8 +49,7 @@ @GUI::Label { text: "Coredump path:" text_alignment: "CenterLeft" - horizontal_size_policy: "Fixed" - preferred_width: 90 + fixed_width: 90 } @GUI::LinkLabel { @@ -64,8 +59,7 @@ } @GUI::Widget { - vertical_size_policy: "Fixed" - preferred_height: 18 + fixed_height: 18 layout: @GUI::HorizontalBoxLayout { } @@ -82,27 +76,20 @@ } @GUI::Widget { - vertical_size_policy: "Fixed" - preferred_height: 32 + fixed_height: 32 layout: @GUI::HorizontalBoxLayout { } // HACK: We need something like Layout::add_spacer() in GML! :^) @GUI::Widget { - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fill" - preferred_width: 377 - preferred_height: 0 } @GUI::Button { name: "close_button" text: "Close" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fixed" - preferred_width: 70 - preferred_height: 22 + fixed_width: 70 + fixed_height: 22 } } } diff --git a/Applications/DisplaySettings/DisplaySettings.cpp b/Applications/DisplaySettings/DisplaySettings.cpp index c992cb2888..70a2a7f265 100644 --- a/Applications/DisplaySettings/DisplaySettings.cpp +++ b/Applications/DisplaySettings/DisplaySettings.cpp @@ -101,26 +101,22 @@ void DisplaySettingsWidget::create_frame() /// Wallpaper Preview ///////////////////////////////////////////////////////////////////////// m_monitor_widget = settings_content.add(); - 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(); wallpaper_selection_container.set_layout(); 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(); 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(); - 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::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 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(); mode_selection_container.set_layout(); 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(); 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(); - 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::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(); resolution_selection_container.set_layout(); - 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(); 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(); - 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::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(); color_selection_container.set_layout(); - 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(); 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(); 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(); bottom_widget.set_layout(); 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(); 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(); 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(); 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(); }; diff --git a/Applications/FileManager/FileManagerWindow.gml b/Applications/FileManager/FileManagerWindow.gml index e2e67d4499..a13218dd16 100644 --- a/Applications/FileManager/FileManagerWindow.gml +++ b/Applications/FileManager/FileManagerWindow.gml @@ -19,8 +19,7 @@ @GUI::TextBox { name: "location_textbox" - vertical_size_policy: "Fixed" - preferred_height: 22 + fixed_height: 22 } } @GUI::ToolBar { @@ -37,8 +36,7 @@ @GUI::TreeView { name: "tree_view" - horizontal_size_policy: "Fixed" - preferred_width: 175 + fixed_width: 175 } } diff --git a/Applications/FileManager/PropertiesDialog.cpp b/Applications/FileManager/PropertiesDialog.cpp index 7f3015bed7..91310d31bc 100644 --- a/Applications/FileManager/PropertiesDialog.cpp +++ b/Applications/FileManager/PropertiesDialog.cpp @@ -63,25 +63,20 @@ PropertiesDialog::PropertiesDialog(const String& path, bool disable_rename, Wind general_tab.layout()->set_margins({ 12, 8, 12, 8 }); general_tab.layout()->set_spacing(10); - general_tab.layout()->add_spacer(); - auto& file_container = general_tab.add(); file_container.set_layout(); - file_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); file_container.layout()->set_spacing(20); - file_container.set_preferred_size(0, 34); + file_container.set_fixed_height(34); m_icon = file_container.add(); - m_icon->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_icon->set_preferred_size(32, 32); + m_icon->set_fixed_size(32, 32); m_name = lexical_path.basename(); m_path = lexical_path.string(); m_parent_path = lexical_path.dirname(); m_name_box = file_container.add(); - m_name_box->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_name_box->set_preferred_size({ 0, 22 }); + m_name_box->set_fixed_height(22); m_name_box->set_text(m_name); m_name_box->set_mode(disable_rename ? GUI::TextBox::Mode::DisplayOnly : GUI::TextBox::Mode::Editable); m_name_box->on_change = [&]() { @@ -151,8 +146,7 @@ PropertiesDialog::PropertiesDialog(const String& path, bool disable_rename, Wind auto& button_widget = main_widget.add(); button_widget.set_layout(); - button_widget.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - button_widget.set_preferred_size(0, 24); + button_widget.set_fixed_height(24); button_widget.layout()->set_spacing(5); button_widget.layout()->add_spacer(); @@ -237,8 +231,7 @@ void PropertiesDialog::make_permission_checkboxes(GUI::Widget& parent, Permissio { auto& widget = parent.add(); widget.set_layout(); - widget.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - widget.set_preferred_size(0, 16); + widget.set_fixed_height(16); widget.layout()->set_spacing(10); auto& label = widget.add(label_string); @@ -277,13 +270,11 @@ void PropertiesDialog::make_property_value_pairs(const Vector for (auto pair : pairs) { auto& label_container = parent.add(); label_container.set_layout(); - label_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - label_container.set_preferred_size(0, 14); + label_container.set_fixed_height(14); label_container.layout()->set_spacing(12); auto& label_property = label_container.add(pair.property); label_property.set_text_alignment(Gfx::TextAlignment::CenterLeft); - label_property.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); if (!pair.link.has_value()) { label_container.add(pair.value).set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -300,24 +291,18 @@ void PropertiesDialog::make_property_value_pairs(const Vector } for (auto label : property_labels) - label->set_preferred_size({ max_width, 0 }); + label->set_fixed_width(max_width); } GUI::Button& PropertiesDialog::make_button(String text, GUI::Widget& parent) { auto& button = parent.add(text); - button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - button.set_preferred_size(70, 22); + button.set_fixed_size(70, 22); return button; } void PropertiesDialog::make_divider(GUI::Widget& parent) { - parent.layout()->add_spacer(); - auto& divider = parent.add(); - divider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - divider.set_preferred_size({ 0, 2 }); - - parent.layout()->add_spacer(); + divider.set_fixed_height(2); } diff --git a/Applications/FontEditor/FontEditor.cpp b/Applications/FontEditor/FontEditor.cpp index e1371fbb57..1b291daf97 100644 --- a/Applications/FontEditor/FontEditor.cpp +++ b/Applications/FontEditor/FontEditor.cpp @@ -54,38 +54,32 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite main_container.set_layout(); main_container.layout()->set_margins({ 4, 4, 4, 4 }); main_container.set_background_role(Gfx::ColorRole::SyntaxKeyword); - main_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); // Top-Left Glyph Editor and info auto& editor_container = main_container.add(); editor_container.set_layout(); editor_container.layout()->set_margins({ 4, 4, 4, 4 }); editor_container.set_background_role(Gfx::ColorRole::SyntaxKeyword); - editor_container.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); m_glyph_editor_widget = editor_container.add(*m_edited_font); - m_glyph_editor_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_glyph_editor_widget->set_preferred_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height()); + m_glyph_editor_widget->set_fixed_size(m_glyph_editor_widget->preferred_width(), m_glyph_editor_widget->preferred_height()); - editor_container.set_preferred_size(m_glyph_editor_widget->preferred_width(), 0); + editor_container.set_fixed_width(m_glyph_editor_widget->preferred_width()); auto& glyph_width_label = editor_container.add(); - glyph_width_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - glyph_width_label.set_preferred_size(0, 22); + glyph_width_label.set_fixed_height(22); glyph_width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); glyph_width_label.set_text("Glyph width:"); auto& glyph_width_spinbox = editor_container.add(); - glyph_width_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - glyph_width_spinbox.set_preferred_size(0, 22); + glyph_width_spinbox.set_fixed_height(22); glyph_width_spinbox.set_min(0); glyph_width_spinbox.set_max(32); glyph_width_spinbox.set_value(0); glyph_width_spinbox.set_enabled(!m_edited_font->is_fixed_width()); auto& info_label = editor_container.add(); - info_label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - info_label.set_preferred_size(0, 22); + info_label.set_fixed_height(22); info_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); info_label.set_text("info_label"); @@ -94,50 +88,41 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite auto& map_and_test_container = main_container.add(); map_and_test_container.set_layout(); map_and_test_container.layout()->set_margins({ 4, 4, 4, 4 }); - map_and_test_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); m_glyph_map_widget = map_and_test_container.add(*m_edited_font); - m_glyph_map_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_glyph_map_widget->set_preferred_size(m_glyph_map_widget->preferred_width(), m_glyph_map_widget->preferred_height()); + m_glyph_map_widget->set_fixed_size(m_glyph_map_widget->preferred_width(), m_glyph_map_widget->preferred_height()); auto& font_mtest_group_box = map_and_test_container.add(); font_mtest_group_box.set_layout(); font_mtest_group_box.layout()->set_margins({ 5, 15, 5, 5 }); - font_mtest_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - font_mtest_group_box.set_preferred_size(0, 2 * m_edited_font->glyph_height() + 50); + font_mtest_group_box.set_fixed_height(2 * m_edited_font->glyph_height() + 50); font_mtest_group_box.set_title("Test"); auto& demo_label_1 = font_mtest_group_box.add(); - demo_label_1.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); demo_label_1.set_font(m_edited_font); demo_label_1.set_text("quick fox jumps nightly above wizard."); auto& demo_label_2 = font_mtest_group_box.add(); - demo_label_2.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); demo_label_2.set_font(m_edited_font); demo_label_2.set_text("QUICK FOX JUMPS NIGHTLY ABOVE WIZARD!"); auto& font_metadata_group_box = map_and_test_container.add(); font_metadata_group_box.set_layout(); font_metadata_group_box.layout()->set_margins({ 5, 15, 5, 5 }); - font_metadata_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - font_metadata_group_box.set_preferred_size(0, 275); + font_metadata_group_box.set_fixed_height(275); font_metadata_group_box.set_title("Font metadata"); //// Name Row auto& namecontainer = font_metadata_group_box.add(); namecontainer.set_layout(); - namecontainer.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - namecontainer.set_preferred_size(0, 22); + namecontainer.set_fixed_height(22); auto& name_label = namecontainer.add(); - name_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - name_label.set_preferred_size(100, 0); + name_label.set_fixed_width(100); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label.set_text("Name:"); auto& name_textbox = namecontainer.add(); - name_textbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); name_textbox.set_text(m_edited_font->name()); name_textbox.on_change = [&] { m_edited_font->set_name(name_textbox.text()); @@ -146,17 +131,14 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Family Row auto& family_container = font_metadata_group_box.add(); family_container.set_layout(); - family_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - family_container.set_preferred_size(0, 22); + family_container.set_fixed_height(22); auto& family_label = family_container.add(); - family_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - family_label.set_preferred_size(100, 0); + family_label.set_fixed_width(100); family_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); family_label.set_text("Family:"); auto& family_textbox = family_container.add(); - family_textbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); family_textbox.set_text(m_edited_font->family()); family_textbox.on_change = [&] { m_edited_font->set_family(family_textbox.text()); @@ -165,17 +147,14 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Presentation size Row auto& presentation_size_container = font_metadata_group_box.add(); presentation_size_container.set_layout(); - presentation_size_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - presentation_size_container.set_preferred_size(0, 22); + presentation_size_container.set_fixed_height(22); auto& presentation_size_label = presentation_size_container.add(); - presentation_size_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - presentation_size_label.set_preferred_size(100, 0); + presentation_size_label.set_fixed_width(100); presentation_size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); presentation_size_label.set_text("Presentation size:"); auto& presentation_size_spinbox = presentation_size_container.add(); - presentation_size_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); presentation_size_spinbox.set_min(0); presentation_size_spinbox.set_max(255); presentation_size_spinbox.set_value(m_edited_font->presentation_size()); @@ -183,17 +162,14 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Weight Row auto& weight_container = font_metadata_group_box.add(); weight_container.set_layout(); - weight_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - weight_container.set_preferred_size(0, 22); + weight_container.set_fixed_height(22); auto& weight_label = weight_container.add(); - weight_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - weight_label.set_preferred_size(100, 0); + weight_label.set_fixed_width(100); weight_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); weight_label.set_text("Weight:"); auto& weight_spinbox = weight_container.add(); - weight_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); weight_spinbox.set_min(0); weight_spinbox.set_max(65535); weight_spinbox.set_value(m_edited_font->weight()); @@ -201,17 +177,14 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Glyph spacing Row auto& glyph_spacing_container = font_metadata_group_box.add(); glyph_spacing_container.set_layout(); - glyph_spacing_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - glyph_spacing_container.set_preferred_size(0, 22); + glyph_spacing_container.set_fixed_height(22); auto& glyph_spacing = glyph_spacing_container.add(); - glyph_spacing.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - glyph_spacing.set_preferred_size(100, 0); + glyph_spacing.set_fixed_width(100); glyph_spacing.set_text_alignment(Gfx::TextAlignment::CenterLeft); glyph_spacing.set_text("Glyph spacing:"); auto& spacing_spinbox = glyph_spacing_container.add(); - spacing_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); spacing_spinbox.set_min(0); spacing_spinbox.set_max(255); spacing_spinbox.set_value(m_edited_font->glyph_spacing()); @@ -219,17 +192,14 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Glyph Height Row auto& glyph_height_container = font_metadata_group_box.add(); glyph_height_container.set_layout(); - glyph_height_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - glyph_height_container.set_preferred_size(0, 22); + glyph_height_container.set_fixed_height(22); auto& glyph_height = glyph_height_container.add(); - glyph_height.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - glyph_height.set_preferred_size(100, 0); + glyph_height.set_fixed_width(100); glyph_height.set_text_alignment(Gfx::TextAlignment::CenterLeft); glyph_height.set_text("Glyph height:"); auto& glyph_height_spinbox = glyph_height_container.add(); - glyph_height_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); glyph_height_spinbox.set_min(0); glyph_height_spinbox.set_max(255); glyph_height_spinbox.set_value(m_edited_font->glyph_height()); @@ -238,17 +208,14 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Glyph width Row auto& glyph_weight_container = font_metadata_group_box.add(); glyph_weight_container.set_layout(); - glyph_weight_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - glyph_weight_container.set_preferred_size(0, 22); + glyph_weight_container.set_fixed_height(22); auto& glyph_header_width_label = glyph_weight_container.add(); - glyph_header_width_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - glyph_header_width_label.set_preferred_size(100, 0); + glyph_header_width_label.set_fixed_width(100); glyph_header_width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); glyph_header_width_label.set_text("Glyph width:"); auto& glyph_header_width_spinbox = glyph_weight_container.add(); - glyph_header_width_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); glyph_header_width_spinbox.set_min(0); glyph_header_width_spinbox.set_max(255); glyph_header_width_spinbox.set_value(m_edited_font->glyph_fixed_width()); @@ -257,18 +224,14 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Baseline Row auto& baseline_container = font_metadata_group_box.add(); baseline_container.set_layout(); - baseline_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - baseline_container.set_preferred_size(0, 22); + baseline_container.set_fixed_height(22); auto& baseline_label = baseline_container.add(); - baseline_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - baseline_label.set_preferred_size(100, 0); + baseline_label.set_fixed_width(100); baseline_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); baseline_label.set_text("Baseline:"); auto& baseline_spinbox = baseline_container.add(); - baseline_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); - baseline_spinbox.set_preferred_size(100, 0); baseline_spinbox.set_min(0); baseline_spinbox.set_max(m_edited_font->glyph_height() - 1); baseline_spinbox.set_value(m_edited_font->baseline()); @@ -276,26 +239,21 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite //// Mean line Row auto& mean_line_container = font_metadata_group_box.add(); mean_line_container.set_layout(); - mean_line_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - mean_line_container.set_preferred_size(0, 22); + mean_line_container.set_fixed_height(22); auto& mean_line_label = mean_line_container.add(); - mean_line_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - mean_line_label.set_preferred_size(100, 0); + mean_line_label.set_fixed_width(100); mean_line_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); mean_line_label.set_text("Mean Line:"); auto& mean_line_spinbox = mean_line_container.add(); - mean_line_spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); - mean_line_spinbox.set_preferred_size(100, 0); mean_line_spinbox.set_min(0); mean_line_spinbox.set_max(m_edited_font->glyph_height() - 1); mean_line_spinbox.set_value(m_edited_font->mean_line()); //// Fixed checkbox Row auto& fixed_width_checkbox = font_metadata_group_box.add(); - fixed_width_checkbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - fixed_width_checkbox.set_preferred_size(0, 22); + fixed_width_checkbox.set_fixed_height(22); fixed_width_checkbox.set_text("Fixed width"); fixed_width_checkbox.set_checked(m_edited_font->is_fixed_width()); @@ -303,20 +261,17 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& edite auto& bottom_container = add(); bottom_container.set_layout(); bottom_container.layout()->set_margins({ 8, 0, 8, 8 }); - bottom_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - bottom_container.set_preferred_size(0, 32); + bottom_container.set_fixed_height(32); bottom_container.layout()->add_spacer(); auto& save_button = bottom_container.add(); - save_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - save_button.set_preferred_size(80, 0); + save_button.set_fixed_size(80, 22); save_button.set_text("Save"); save_button.on_click = [this](auto) { save_as(m_path); }; auto& quit_button = bottom_container.add(); - quit_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - quit_button.set_preferred_size(80, 0); + quit_button.set_fixed_size(80, 22); quit_button.set_text("Quit"); quit_button.on_click = [](auto) { exit(0); diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index 373d9bf407..a09fc43f33 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -124,8 +124,7 @@ int main(int argc, char* argv[]) search_view.layout()->set_margins({ 4, 4, 4, 4 }); auto& search_box = search_view.add(); auto& search_list_view = search_view.add(); - search_box.set_preferred_size(0, 20); - search_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + search_box.set_fixed_height(20); search_box.set_placeholder("Search..."); search_box.on_change = [&] { if (auto model = search_list_view.model()) { @@ -138,8 +137,7 @@ int main(int argc, char* argv[]) search_list_view.model()->update(); tree_view.set_model(model); - left_tab_bar.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - left_tab_bar.set_preferred_size(200, 500); + left_tab_bar.set_fixed_width(200); auto& page_view = splitter.add(); diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp index 327f76f08c..a3e628b785 100644 --- a/Applications/IRCClient/IRCAppWindow.cpp +++ b/Applications/IRCClient/IRCAppWindow.cpp @@ -333,8 +333,7 @@ void IRCAppWindow::setup_widgets() m_window_list->set_alternating_row_colors(false); m_window_list->set_model(m_client->client_window_list_model()); m_window_list->set_activates_on_selection(true); - m_window_list->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - m_window_list->set_preferred_size(100, 0); + m_window_list->set_fixed_width(100); m_window_list->on_activation = [this](auto& index) { set_active_window(m_client->window_at(index.row())); }; diff --git a/Applications/IRCClient/IRCWindow.cpp b/Applications/IRCClient/IRCWindow.cpp index 777e0ad223..7a84795b8f 100644 --- a/Applications/IRCClient/IRCWindow.cpp +++ b/Applications/IRCClient/IRCWindow.cpp @@ -57,8 +57,7 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na if (m_type == Channel) { auto& member_view = container.add(); member_view.set_column_headers_visible(false); - member_view.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - member_view.set_preferred_size(100, 0); + member_view.set_fixed_width(100); member_view.set_alternating_row_colors(false); member_view.set_model(channel().member_model()); member_view.set_activates_on_selection(true); @@ -189,8 +188,7 @@ IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& na } m_text_box = add(); - m_text_box->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_text_box->set_preferred_size(0, 19); + m_text_box->set_fixed_height(19); m_text_box->on_return_pressed = [this] { if (m_type == Channel) m_client->handle_user_input_in_channel(m_name, m_text_box->text()); diff --git a/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Applications/KeyboardMapper/KeyboardMapperWidget.cpp index d88fa98b0f..7f2e288251 100644 --- a/Applications/KeyboardMapper/KeyboardMapperWidget.cpp +++ b/Applications/KeyboardMapper/KeyboardMapperWidget.cpp @@ -49,7 +49,6 @@ void KeyboardMapperWidget::create_frame() { set_fill_with_background_color(true); set_layout(); - set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); layout()->set_margins({ 4, 4, 4, 4 }); auto& main_widget = add(); @@ -105,14 +104,12 @@ void KeyboardMapperWidget::create_frame() // Action Buttons auto& bottom_widget = add(); bottom_widget.set_layout(); - bottom_widget.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - bottom_widget.set_preferred_size(0, 40); + bottom_widget.set_fixed_height(40); // Map Selection m_map_group = bottom_widget.add(); m_map_group->set_layout(); - m_map_group->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - m_map_group->set_preferred_size(250, 0); + m_map_group->set_fixed_width(250); auto& radio_map = m_map_group->add("Default"); radio_map.set_name("map"); @@ -139,8 +136,7 @@ void KeyboardMapperWidget::create_frame() auto& ok_button = bottom_widget.add(); ok_button.set_text("Save"); - ok_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - ok_button.set_preferred_size(80, 0); + ok_button.set_fixed_width(80); ok_button.on_click = [this](auto) { save(); }; diff --git a/Applications/KeyboardSettings/main.cpp b/Applications/KeyboardSettings/main.cpp index b9ad85ff88..d408afe707 100644 --- a/Applications/KeyboardSettings/main.cpp +++ b/Applications/KeyboardSettings/main.cpp @@ -126,18 +126,15 @@ int main(int argc, char** argv) auto& character_map_file_selection_container = root_widget.add(); character_map_file_selection_container.set_layout(); - character_map_file_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - character_map_file_selection_container.set_preferred_size(0, 22); + character_map_file_selection_container.set_fixed_height(22); auto& character_map_file_label = character_map_file_selection_container.add(); character_map_file_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - character_map_file_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - character_map_file_label.set_preferred_size({ 130, 0 }); + character_map_file_label.set_fixed_width(130); character_map_file_label.set_text("Character Mapping File:"); auto& character_map_file_combo = character_map_file_selection_container.add(); - character_map_file_combo.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - character_map_file_combo.set_preferred_size(0, 22); + character_map_file_combo.set_fixed_height(22); character_map_file_combo.set_only_allow_values_from_model(true); character_map_file_combo.set_model(*CharacterMapFileListModel::create(character_map_files)); character_map_file_combo.set_selected_index(initial_keymap_index); @@ -163,29 +160,25 @@ int main(int argc, char** argv) auto& bottom_widget = root_widget.add(); bottom_widget.set_layout(); bottom_widget.layout()->add_spacer(); - bottom_widget.set_size_policy(Orientation::Vertical, GUI::SizePolicy::Fixed); - bottom_widget.set_preferred_size(1, 22); + bottom_widget.set_fixed_height(22); auto& apply_button = bottom_widget.add(); 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_width(60); apply_button.on_click = [&](auto) { apply_settings(false); }; auto& ok_button = bottom_widget.add(); 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_width(60); ok_button.on_click = [&](auto) { apply_settings(true); }; auto& cancel_button = bottom_widget.add(); 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_width(60); cancel_button.on_click = [&](auto) { app->quit(); }; diff --git a/Applications/Piano/KnobsWidget.cpp b/Applications/Piano/KnobsWidget.cpp index 01f647a017..3192e500c1 100644 --- a/Applications/Piano/KnobsWidget.cpp +++ b/Applications/Piano/KnobsWidget.cpp @@ -47,8 +47,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget) m_labels_container = add(); m_labels_container->set_layout(); - m_labels_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_labels_container->set_preferred_size(0, 20); + m_labels_container->set_fixed_height(20); m_octave_label = m_labels_container->add("Octave"); m_wave_label = m_labels_container->add("Wave"); @@ -60,8 +59,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget) m_values_container = add(); m_values_container->set_layout(); - m_values_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_values_container->set_preferred_size(0, 10); + m_values_container->set_fixed_height(10); m_octave_value = m_values_container->add(String::number(m_track_manager.octave())); m_wave_value = m_values_container->add(wave_strings[m_track_manager.current_track().wave()]); diff --git a/Applications/Piano/MainWidget.cpp b/Applications/Piano/MainWidget.cpp index fbfafd81fb..ef40a4fd1a 100644 --- a/Applications/Piano/MainWidget.cpp +++ b/Applications/Piano/MainWidget.cpp @@ -46,29 +46,25 @@ MainWidget::MainWidget(TrackManager& track_manager) set_fill_with_background_color(true); m_wave_widget = add(track_manager); - m_wave_widget->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_wave_widget->set_preferred_size(0, 100); + m_wave_widget->set_fixed_height(100); m_tab_widget = add(); m_roll_widget = m_tab_widget->add_tab("Piano Roll", track_manager); - m_roll_widget->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); - m_roll_widget->set_preferred_size(0, 300); + m_roll_widget->set_fixed_height(300); m_tab_widget->add_tab("Sampler", track_manager); m_keys_and_knobs_container = add(); m_keys_and_knobs_container->set_layout(); m_keys_and_knobs_container->layout()->set_spacing(2); - m_keys_and_knobs_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_keys_and_knobs_container->set_preferred_size(0, 100); + m_keys_and_knobs_container->set_fixed_height(100); m_keys_and_knobs_container->set_fill_with_background_color(true); m_keys_widget = m_keys_and_knobs_container->add(track_manager); m_knobs_widget = m_keys_and_knobs_container->add(track_manager, *this); - m_knobs_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - m_knobs_widget->set_preferred_size(350, 0); + m_knobs_widget->set_fixed_width(350); m_roll_widget->set_keys_widget(m_keys_widget); } diff --git a/Applications/Piano/SamplerWidget.cpp b/Applications/Piano/SamplerWidget.cpp index ce5b6488d0..72704f28c7 100644 --- a/Applications/Piano/SamplerWidget.cpp +++ b/Applications/Piano/SamplerWidget.cpp @@ -99,12 +99,10 @@ SamplerWidget::SamplerWidget(TrackManager& track_manager) m_open_button_and_recorded_sample_name_container = add(); m_open_button_and_recorded_sample_name_container->set_layout(); m_open_button_and_recorded_sample_name_container->layout()->set_spacing(10); - m_open_button_and_recorded_sample_name_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_open_button_and_recorded_sample_name_container->set_preferred_size(0, 24); + m_open_button_and_recorded_sample_name_container->set_fixed_height(24); m_open_button = m_open_button_and_recorded_sample_name_container->add(); - m_open_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - m_open_button->set_preferred_size(24, 24); + m_open_button->set_fixed_size(24, 24); m_open_button->set_focus_policy(GUI::FocusPolicy::TabFocus); m_open_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png")); m_open_button->on_click = [this](auto) { @@ -124,8 +122,7 @@ SamplerWidget::SamplerWidget(TrackManager& track_manager) m_recorded_sample_name->set_text_alignment(Gfx::TextAlignment::CenterLeft); m_wave_editor = add(m_track_manager); - m_wave_editor->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_wave_editor->set_preferred_size(0, 100); + m_wave_editor->set_fixed_height(100); } SamplerWidget::~SamplerWidget() diff --git a/Applications/PixelPaint/BrushTool.cpp b/Applications/PixelPaint/BrushTool.cpp index 0d099a8087..39d2ad182e 100644 --- a/Applications/PixelPaint/BrushTool.cpp +++ b/Applications/PixelPaint/BrushTool.cpp @@ -131,18 +131,15 @@ GUI::Widget* BrushTool::get_properties_widget() m_properties_widget->set_layout(); auto& size_container = m_properties_widget->add(); - size_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - size_container.set_preferred_size(0, 20); + size_container.set_fixed_height(20); size_container.set_layout(); auto& size_label = size_container.add("Size:"); size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - size_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - size_label.set_preferred_size(80, 20); + size_label.set_fixed_size(80, 20); auto& size_slider = size_container.add(); - size_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - size_slider.set_preferred_size(0, 20); + size_slider.set_fixed_height(20); size_slider.set_range(1, 100); size_slider.set_value(m_size); size_slider.on_value_changed = [this](int value) { @@ -150,18 +147,15 @@ GUI::Widget* BrushTool::get_properties_widget() }; auto& hardness_container = m_properties_widget->add(); - hardness_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - hardness_container.set_preferred_size(0, 20); + hardness_container.set_fixed_height(20); hardness_container.set_layout(); auto& hardness_label = hardness_container.add("Hardness:"); hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - hardness_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - hardness_label.set_preferred_size(80, 20); + hardness_label.set_fixed_size(80, 20); auto& hardness_slider = hardness_container.add(); - hardness_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - hardness_slider.set_preferred_size(0, 20); + hardness_slider.set_fixed_height(20); hardness_slider.set_range(1, 99); hardness_slider.set_value(m_hardness); hardness_slider.on_value_changed = [this](int value) { diff --git a/Applications/PixelPaint/BucketTool.cpp b/Applications/PixelPaint/BucketTool.cpp index 09e2e51545..7973c7938d 100644 --- a/Applications/PixelPaint/BucketTool.cpp +++ b/Applications/PixelPaint/BucketTool.cpp @@ -111,18 +111,15 @@ GUI::Widget* BucketTool::get_properties_widget() m_properties_widget->set_layout(); auto& threshold_container = m_properties_widget->add(); - threshold_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - threshold_container.set_preferred_size(0, 20); + threshold_container.set_fixed_height(20); threshold_container.set_layout(); auto& threshold_label = threshold_container.add("Threshold:"); threshold_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - threshold_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - threshold_label.set_preferred_size(80, 20); + threshold_label.set_fixed_size(80, 20); auto& threshold_slider = threshold_container.add(); - threshold_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - threshold_slider.set_preferred_size(0, 20); + threshold_slider.set_fixed_height(20); threshold_slider.set_range(0, 100); threshold_slider.set_value(m_threshold); threshold_slider.on_value_changed = [this](int value) { diff --git a/Applications/PixelPaint/FilterParams.h b/Applications/PixelPaint/FilterParams.h index 8d174c0989..398caecf9f 100644 --- a/Applications/PixelPaint/FilterParams.h +++ b/Applications/PixelPaint/FilterParams.h @@ -82,7 +82,6 @@ private: for (size_t column = 0; column < columns; ++column) { if (index < columns * rows) { auto& textbox = horizontal_container.template add(); - textbox.set_preferred_size({ 30, 50 }); textbox.on_change = [&, row = row, column = column] { auto& element = m_matrix.elements()[row][column]; char* endptr = nullptr; diff --git a/Applications/PixelPaint/LayerPropertiesWidget.cpp b/Applications/PixelPaint/LayerPropertiesWidget.cpp index fccc607a21..6478d3e213 100644 --- a/Applications/PixelPaint/LayerPropertiesWidget.cpp +++ b/Applications/PixelPaint/LayerPropertiesWidget.cpp @@ -46,36 +46,30 @@ LayerPropertiesWidget::LayerPropertiesWidget() layout.set_margins({ 10, 20, 10, 10 }); auto& name_container = group_box.add(); - name_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - name_container.set_preferred_size(0, 20); + name_container.set_fixed_height(20); name_container.set_layout(); auto& name_label = name_container.add("Name:"); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - name_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - name_label.set_preferred_size(80, 20); + name_label.set_fixed_size(80, 20); m_name_textbox = name_container.add(); - m_name_textbox->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_name_textbox->set_preferred_size(0, 20); + m_name_textbox->set_fixed_height(20); m_name_textbox->on_change = [this] { if (m_layer) m_layer->set_name(m_name_textbox->text()); }; auto& opacity_container = group_box.add(); - opacity_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - opacity_container.set_preferred_size(0, 20); + opacity_container.set_fixed_height(20); opacity_container.set_layout(); auto& opacity_label = opacity_container.add("Opacity:"); opacity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - opacity_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - opacity_label.set_preferred_size(80, 20); + opacity_label.set_fixed_size(80, 20); m_opacity_slider = opacity_container.add(); - m_opacity_slider->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_opacity_slider->set_preferred_size(0, 20); + m_opacity_slider->set_fixed_height(20); m_opacity_slider->set_range(0, 100); m_opacity_slider->on_value_changed = [this](int value) { if (m_layer) @@ -83,8 +77,7 @@ LayerPropertiesWidget::LayerPropertiesWidget() }; m_visibility_checkbox = group_box.add("Visible"); - m_visibility_checkbox->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_visibility_checkbox->set_preferred_size(0, 20); + m_visibility_checkbox->set_fixed_height(20); m_visibility_checkbox->on_checked = [this](bool checked) { if (m_layer) m_layer->set_visible(checked); diff --git a/Applications/PixelPaint/PaletteWidget.cpp b/Applications/PixelPaint/PaletteWidget.cpp index 985f87144f..52620b4b31 100644 --- a/Applications/PixelPaint/PaletteWidget.cpp +++ b/Applications/PixelPaint/PaletteWidget.cpp @@ -79,8 +79,7 @@ PaletteWidget::PaletteWidget(ImageEditor& editor) set_frame_thickness(0); set_fill_with_background_color(true); - set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - set_preferred_size(0, 34); + set_fixed_height(34); m_secondary_color_widget = add(); m_secondary_color_widget->set_relative_rect({ 2, 2, 60, 31 }); diff --git a/Applications/PixelPaint/PenTool.cpp b/Applications/PixelPaint/PenTool.cpp index 25896623e6..a91a02918f 100644 --- a/Applications/PixelPaint/PenTool.cpp +++ b/Applications/PixelPaint/PenTool.cpp @@ -106,18 +106,15 @@ GUI::Widget* PenTool::get_properties_widget() m_properties_widget->set_layout(); auto& thickness_container = m_properties_widget->add(); - thickness_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - thickness_container.set_preferred_size(0, 20); + thickness_container.set_fixed_height(20); thickness_container.set_layout(); auto& thickness_label = thickness_container.add("Thickness:"); thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - thickness_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - thickness_label.set_preferred_size(80, 20); + thickness_label.set_fixed_size(80, 20); auto& thickness_slider = thickness_container.add(); - thickness_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - thickness_slider.set_preferred_size(0, 20); + thickness_slider.set_fixed_height(20); thickness_slider.set_range(1, 20); thickness_slider.set_value(m_thickness); thickness_slider.on_value_changed = [this](int value) { diff --git a/Applications/PixelPaint/SprayTool.cpp b/Applications/PixelPaint/SprayTool.cpp index 9ec5c12894..eaf0def9f2 100644 --- a/Applications/PixelPaint/SprayTool.cpp +++ b/Applications/PixelPaint/SprayTool.cpp @@ -138,18 +138,15 @@ GUI::Widget* SprayTool::get_properties_widget() m_properties_widget->set_layout(); auto& thickness_container = m_properties_widget->add(); - thickness_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - thickness_container.set_preferred_size(0, 20); + thickness_container.set_fixed_height(20); thickness_container.set_layout(); auto& thickness_label = thickness_container.add("Thickness:"); thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - thickness_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - thickness_label.set_preferred_size(80, 20); + thickness_label.set_fixed_size(80, 20); auto& thickness_slider = thickness_container.add(); - thickness_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - thickness_slider.set_preferred_size(0, 20); + thickness_slider.set_fixed_height(20); thickness_slider.set_range(1, 20); thickness_slider.set_value(m_thickness); thickness_slider.on_value_changed = [this](int value) { @@ -157,18 +154,15 @@ GUI::Widget* SprayTool::get_properties_widget() }; auto& density_container = m_properties_widget->add(); - density_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - density_container.set_preferred_size(0, 20); + density_container.set_fixed_height(20); density_container.set_layout(); auto& density_label = density_container.add("Density:"); density_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - density_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - density_label.set_preferred_size(80, 20); + density_label.set_fixed_size(80, 20); auto& density_slider = density_container.add(); - density_slider.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - density_slider.set_preferred_size(0, 30); + density_slider.set_fixed_height(30); density_slider.set_range(1, 100); density_slider.set_value(m_density); density_slider.on_value_changed = [this](int value) { diff --git a/Applications/PixelPaint/ToolboxWidget.cpp b/Applications/PixelPaint/ToolboxWidget.cpp index d497506df3..ee9b86024c 100644 --- a/Applications/PixelPaint/ToolboxWidget.cpp +++ b/Applications/PixelPaint/ToolboxWidget.cpp @@ -96,8 +96,7 @@ ToolboxWidget::ToolboxWidget() set_frame_shape(Gfx::FrameShape::Panel); set_frame_shadow(Gfx::FrameShadow::Raised); - set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - set_preferred_size(48, 0); + set_fixed_width(48); set_layout(); layout()->set_margins({ 4, 4, 4, 4 }); @@ -119,8 +118,7 @@ void ToolboxWidget::setup_tools() auto add_tool = [&](const StringView& name, const StringView& icon_name, const GUI::Shortcut& shortcut, NonnullOwnPtr tool) -> ToolButton& { m_tools.append(tool.ptr()); auto& button = add(*this, name, shortcut, move(tool)); - button.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - button.set_preferred_size(0, 32); + button.set_fixed_height(32); button.set_checkable(true); button.set_icon(Gfx::Bitmap::load_from_file(String::formatted("/res/icons/pixelpaint/{}.png", icon_name))); return button; diff --git a/Applications/PixelPaint/main.cpp b/Applications/PixelPaint/main.cpp index cdcdedf776..47a401c925 100644 --- a/Applications/PixelPaint/main.cpp +++ b/Applications/PixelPaint/main.cpp @@ -90,8 +90,7 @@ int main(int argc, char** argv) auto& right_panel = horizontal_container.add(); right_panel.set_fill_with_background_color(true); - right_panel.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - right_panel.set_preferred_size(230, 0); + right_panel.set_fixed_width(230); right_panel.set_layout(); auto& layer_list_widget = right_panel.add(); diff --git a/Applications/SoundPlayer/SoundPlayerWidget.cpp b/Applications/SoundPlayer/SoundPlayerWidget.cpp index 4c221a064d..f2066aca89 100644 --- a/Applications/SoundPlayer/SoundPlayerWidget.cpp +++ b/Applications/SoundPlayer/SoundPlayerWidget.cpp @@ -50,12 +50,10 @@ SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtrset_frame_shape(Gfx::FrameShape::Container); m_elapsed->set_frame_shadow(Gfx::FrameShadow::Sunken); m_elapsed->set_frame_thickness(2); - m_elapsed->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - m_elapsed->set_preferred_size(80, 0); + m_elapsed->set_fixed_width(80); auto& sample_widget_container = status_widget.add(); sample_widget_container.set_layout(); - sample_widget_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); m_sample_widget = sample_widget_container.add(); @@ -63,8 +61,7 @@ SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtrset_frame_shape(Gfx::FrameShape::Container); m_remaining->set_frame_shadow(Gfx::FrameShadow::Sunken); m_remaining->set_frame_thickness(2); - m_remaining->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - m_remaining->set_preferred_size(80, 0); + m_remaining->set_fixed_width(80); m_slider = add(Orientation::Horizontal); m_slider->set_min(0); @@ -74,8 +71,7 @@ SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtr(); control_widget.set_fill_with_background_color(true); control_widget.set_layout(); - control_widget.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - control_widget.set_preferred_size(0, 30); + control_widget.set_fixed_height(30); control_widget.layout()->set_margins({ 10, 2, 10, 2 }); control_widget.layout()->set_spacing(10); @@ -96,8 +92,7 @@ SoundPlayerWidget::SoundPlayerWidget(GUI::Window& window, NonnullRefPtrset_frame_shadow(Gfx::FrameShadow::Raised); m_status->set_frame_thickness(4); m_status->set_text_alignment(Gfx::TextAlignment::CenterLeft); - m_status->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_status->set_preferred_size(0, 18); + m_status->set_fixed_height(18); m_status->set_text("No file open!"); update_position(0); diff --git a/Applications/Spreadsheet/CellTypeDialog.cpp b/Applications/Spreadsheet/CellTypeDialog.cpp index a6d12c93cb..dc2a3f04d4 100644 --- a/Applications/Spreadsheet/CellTypeDialog.cpp +++ b/Applications/Spreadsheet/CellTypeDialog.cpp @@ -72,14 +72,12 @@ CellTypeDialog::CellTypeDialog(const Vector& positions, Sheet& sheet, setup_tabs(tab_widget, positions, sheet); auto& buttonbox = main_widget.add(); - buttonbox.set_preferred_size({ 0, 20 }); - buttonbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + buttonbox.set_fixed_height(20); auto& button_layout = buttonbox.set_layout(); button_layout.set_spacing(10); button_layout.add_spacer(); auto& ok_button = buttonbox.add("OK"); - ok_button.set_preferred_size({ 80, 0 }); - ok_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); + ok_button.set_fixed_width(80); ok_button.on_click = [&](auto) { done(ExecOK); }; } @@ -155,8 +153,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po left_side.set_layout(); auto& right_side = type_tab.add(); right_side.set_layout(); - right_side.set_preferred_size(170, 0); - right_side.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); + right_side.set_fixed_width(170); auto& type_list = left_side.add(); type_list.set_model(*GUI::ItemListModel::create(g_types)); @@ -179,10 +176,8 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po if (m_length > -1) spinbox.set_value(m_length); - checkbox.set_preferred_size(0, 20); - spinbox.set_preferred_size(0, 20); - checkbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - spinbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + checkbox.set_fixed_height(20); + spinbox.set_fixed_height(20); checkbox.on_checked = [&](auto checked) { spinbox.set_enabled(checked); @@ -203,10 +198,8 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po editor.set_enabled(!m_format.is_empty()); editor.set_text(m_format); - checkbox.set_preferred_size(0, 20); - editor.set_preferred_size(0, 20); - checkbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - editor.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + checkbox.set_fixed_height(20); + editor.set_fixed_height(20); checkbox.on_checked = [&](auto checked) { editor.set_enabled(checked); @@ -229,16 +222,14 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po auto& horizontal_alignment_selection_container = alignment_tab.add(); horizontal_alignment_selection_container.set_layout(); horizontal_alignment_selection_container.layout()->set_margins({ 0, 4, 0, 0 }); - horizontal_alignment_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - horizontal_alignment_selection_container.set_preferred_size(0, 22); + horizontal_alignment_selection_container.set_fixed_height(22); auto& horizontal_alignment_label = horizontal_alignment_selection_container.add(); horizontal_alignment_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); horizontal_alignment_label.set_text("Horizontal Text Alignment"); auto& horizontal_combobox = alignment_tab.add(); - horizontal_combobox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - horizontal_combobox.set_preferred_size(0, 22); + horizontal_combobox.set_fixed_height(22); horizontal_combobox.set_only_allow_values_from_model(true); horizontal_combobox.set_model(*GUI::ItemListModel::create(g_horizontal_alignments)); horizontal_combobox.set_selected_index((int)m_horizontal_alignment); @@ -264,16 +255,14 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po auto& vertical_alignment_container = alignment_tab.add(); vertical_alignment_container.set_layout(); vertical_alignment_container.layout()->set_margins({ 0, 4, 0, 0 }); - vertical_alignment_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - vertical_alignment_container.set_preferred_size(0, 22); + vertical_alignment_container.set_fixed_height(22); auto& vertical_alignment_label = vertical_alignment_container.add(); vertical_alignment_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); vertical_alignment_label.set_text("Vertical Text Alignment"); auto& vertical_combobox = alignment_tab.add(); - vertical_combobox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - vertical_combobox.set_preferred_size(0, 22); + vertical_combobox.set_fixed_height(22); vertical_combobox.set_only_allow_values_from_model(true); vertical_combobox.set_model(*GUI::ItemListModel::create(g_vertical_alignments)); vertical_combobox.set_selected_index((int)m_vertical_alignment); @@ -303,8 +292,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po auto& static_formatting_container = colors_tab.add(); static_formatting_container.set_layout(); static_formatting_container.layout()->set_margins({ 0, 0, 0, 0 }); - static_formatting_container.set_preferred_size(0, 44); - static_formatting_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + static_formatting_container.set_fixed_height(44); // Foreground { @@ -312,16 +300,14 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po auto& foreground_container = static_formatting_container.add(); foreground_container.set_layout(); foreground_container.layout()->set_margins({ 0, 4, 0, 0 }); - foreground_container.set_preferred_size(0, 22); - foreground_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + foreground_container.set_fixed_height(22); auto& foreground_label = foreground_container.add(); foreground_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); foreground_label.set_text("Static Foreground Color"); auto& foreground_selector = foreground_container.add(); - foreground_selector.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - foreground_selector.set_preferred_size(0, 22); + foreground_selector.set_fixed_height(22); if (m_static_format.foreground_color.has_value()) foreground_selector.set_color(m_static_format.foreground_color.value()); foreground_selector.on_change = [&]() { @@ -335,16 +321,14 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, const Vector& po auto& background_container = static_formatting_container.add(); background_container.set_layout(); background_container.layout()->set_margins({ 0, 4, 0, 0 }); - background_container.set_preferred_size(0, 22); - background_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + background_container.set_fixed_height(22); auto& background_label = background_container.add(); background_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); background_label.set_text("Static Background Color"); auto& background_selector = background_container.add(); - background_selector.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - background_selector.set_preferred_size(0, 22); + background_selector.set_fixed_height(22); if (m_static_format.background_color.has_value()) background_selector.set_color(m_static_format.background_color.value()); background_selector.on_change = [&]() { diff --git a/Applications/Spreadsheet/CondFormatting.gml b/Applications/Spreadsheet/CondFormatting.gml index 6ef95e5cdb..6e3d623270 100644 --- a/Applications/Spreadsheet/CondFormatting.gml +++ b/Applications/Spreadsheet/CondFormatting.gml @@ -11,10 +11,7 @@ } @GUI::Widget { - vertical_size_policy: "Fixed" - horizontal_size_policy: "Fill" - preferred_width: 0 - preferred_height: 20 + fixed_height: 20 layout: @GUI::HorizontalBoxLayout { spacing: 10 @@ -23,19 +20,15 @@ @GUI::Button { name: "add_button" text: "Add" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fixed" - preferred_width: 100 - preferred_height: 20 + fixed_width: 100 + fixed_height: 20 } @GUI::Button { name: "remove_button" text: "Remove" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fixed" - preferred_width: 100 - preferred_height: 20 + fixed_width: 100 + fixed_height: 20 } } } diff --git a/Applications/Spreadsheet/CondView.gml b/Applications/Spreadsheet/CondView.gml index d76bd8c734..45ea4f85e3 100644 --- a/Applications/Spreadsheet/CondView.gml +++ b/Applications/Spreadsheet/CondView.gml @@ -8,22 +8,17 @@ spacing: 10 } - vertical_size_policy: "Fixed" - preferred_height: 25 + fixed_height: 25 @GUI::Label { text: "if..." - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fixed" - preferred_width: 40 - preferred_height: 25 + fixed_width: 40 + fixed_height: 25 } @GUI::TextEditor { name: "formula_editor" - horizontal_size_policy: "Fill" - vertical_size_policy: "Fixed" - preferred_height: 25 + fixed_height: 25 tooltip: "Use 'value' to refer to the current cell's value" } } @@ -33,21 +28,17 @@ spacing: 10 } - vertical_size_policy: "Fixed" - preferred_height: 25 + fixed_height: 25 @GUI::Label { text: "Foreground..." - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fixed" - preferred_width: 150 - preferred_height: 25 + fixed_width: 150 + fixed_height: 25 } @GUI::ColorInput { name: "foreground_input" - vertical_size_policy: "Fixed" - preferred_height: 25 + fixed_height: 25 } } @@ -56,21 +47,17 @@ spacing: 10 } - vertical_size_policy: "Fixed" - preferred_height: 25 + fixed_height: 25 @GUI::Label { text: "Background..." - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fixed" - preferred_width: 150 - preferred_height: 25 + fixed_width: 150 + fixed_height: 25 } @GUI::ColorInput { name: "background_input" - vertical_size_policy: "Fixed" - preferred_height: 25 + fixed_height: 25 } } } diff --git a/Applications/Spreadsheet/HelpWindow.cpp b/Applications/Spreadsheet/HelpWindow.cpp index 32369ff73b..6aa6ff5c4d 100644 --- a/Applications/Spreadsheet/HelpWindow.cpp +++ b/Applications/Spreadsheet/HelpWindow.cpp @@ -93,8 +93,7 @@ HelpWindow::HelpWindow(GUI::Window* parent) auto& splitter = widget.add(); auto& left_frame = splitter.add(); left_frame.set_layout().set_margins({ 0, 0, 0, 0 }); - left_frame.set_preferred_size(100, 0); - left_frame.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); + left_frame.set_fixed_width(100); m_listview = left_frame.add(); m_listview->set_activates_on_selection(true); m_listview->set_model(HelpListModel::create()); diff --git a/Applications/Spreadsheet/SpreadsheetWidget.cpp b/Applications/Spreadsheet/SpreadsheetWidget.cpp index 6260ed9ecf..fbe10f54ca 100644 --- a/Applications/Spreadsheet/SpreadsheetWidget.cpp +++ b/Applications/Spreadsheet/SpreadsheetWidget.cpp @@ -51,15 +51,12 @@ SpreadsheetWidget::SpreadsheetWidget(NonnullRefPtrVector&& sheets, bool s auto& top_bar = container.add(); top_bar.set_layout().set_spacing(1); - top_bar.set_preferred_size(0, 26); - top_bar.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + top_bar.set_fixed_height(26); auto& current_cell_label = top_bar.add(""); - current_cell_label.set_preferred_size(50, 0); - current_cell_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); + current_cell_label.set_fixed_width(50); auto& help_button = top_bar.add("🛈"); - help_button.set_preferred_size(20, 20); - help_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); + help_button.set_fixed_size(20, 20); help_button.on_click = [&](auto) { auto docs = m_selected_view->sheet().gather_documentation(); auto help_window = HelpWindow::the(); @@ -89,7 +86,6 @@ SpreadsheetWidget::SpreadsheetWidget(NonnullRefPtrVector&& sheets, bool s inline_widget.set_layout().set_margins({ 4, 4, 4, 4 }); inline_widget.set_frame_shape(Gfx::FrameShape::Box); m_inline_documentation_label = inline_widget.add(); - m_inline_documentation_label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); m_inline_documentation_label->set_fill_with_background_color(true); m_inline_documentation_label->set_autosize(false); m_inline_documentation_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index c4e3b5657a..51f111deb2 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -192,8 +192,7 @@ static RefPtr create_settings_window(TerminalWidget& terminal) auto& radio_container = settings.add("Bell Mode"); radio_container.set_layout(); radio_container.layout()->set_margins({ 6, 16, 6, 6 }); - radio_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - radio_container.set_preferred_size(100, 80); + radio_container.set_fixed_height(80); auto& sysbell_radio = radio_container.add("Use (Audible) System Bell"); auto& visbell_radio = radio_container.add("Use (Visual) Terminal Bell"); @@ -224,8 +223,7 @@ static RefPtr create_settings_window(TerminalWidget& terminal) auto& slider_container = settings.add("Background Opacity"); slider_container.set_layout(); slider_container.layout()->set_margins({ 6, 16, 6, 6 }); - slider_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - slider_container.set_preferred_size(100, 50); + slider_container.set_fixed_height(50); auto& slider = slider_container.add(); slider.on_value_changed = [&terminal](int value) { @@ -238,8 +236,7 @@ static RefPtr create_settings_window(TerminalWidget& terminal) auto& spinbox_container = settings.add("Scroll Length"); spinbox_container.set_layout(); spinbox_container.layout()->set_margins({ 6, 16, 6, 6 }); - spinbox_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - spinbox_container.set_preferred_size(100, 46); + spinbox_container.set_fixed_height(46); auto& spinbox = spinbox_container.add(); spinbox.set_min(1); @@ -251,8 +248,7 @@ static RefPtr create_settings_window(TerminalWidget& terminal) auto& history_size_spinbox_container = settings.add("Maximum scrollback history lines"); history_size_spinbox_container.set_layout(); history_size_spinbox_container.layout()->set_margins({ 6, 16, 6, 6 }); - history_size_spinbox_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - history_size_spinbox_container.set_preferred_size(100, 46); + history_size_spinbox_container.set_fixed_height(46); auto& history_size_spinbox = history_size_spinbox_container.add(); history_size_spinbox.set_range(0, 40960); @@ -281,12 +277,10 @@ static RefPtr create_find_window(TerminalWidget& terminal) auto& find = search.add(); find.set_layout(); find.layout()->set_margins({ 4, 4, 4, 4 }); - find.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - find.set_preferred_height(30); + find.set_fixed_height(30); auto& find_textbox = find.add(); - find_textbox.set_horizontal_size_policy(GUI::SizePolicy::Fixed); - find_textbox.set_preferred_width(230); + find_textbox.set_fixed_width(230); find_textbox.set_focus(true); if (terminal.has_selection()) { String selected_text = terminal.selected_text(); @@ -294,12 +288,10 @@ static RefPtr create_find_window(TerminalWidget& terminal) find_textbox.set_text(selected_text); } auto& find_backwards = find.add(); - find_backwards.set_horizontal_size_policy(GUI::SizePolicy::Fixed); - find_backwards.set_preferred_width(25); + find_backwards.set_fixed_width(25); find_backwards.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png")); auto& find_forwards = find.add(); - find_forwards.set_horizontal_size_policy(GUI::SizePolicy::Fixed); - find_forwards.set_preferred_width(25); + find_forwards.set_fixed_width(25); find_forwards.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/downward-triangle.png")); find_textbox.on_return_pressed = [&]() { @@ -307,11 +299,9 @@ static RefPtr create_find_window(TerminalWidget& terminal) }; auto& match_case = search.add("Case sensitive"); - match_case.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - match_case.set_preferred_size(0, 22); + match_case.set_fixed_height(22); auto& wrap_around = search.add("Wrap around"); - wrap_around.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - wrap_around.set_preferred_size(0, 22); + wrap_around.set_fixed_height(22); find_backwards.on_click = [&](auto) { auto needle = find_textbox.text(); diff --git a/Applications/TextEditor/TextEditorWidget.cpp b/Applications/TextEditor/TextEditorWidget.cpp index 88587fb2cf..65f40b325f 100644 --- a/Applications/TextEditor/TextEditorWidget.cpp +++ b/Applications/TextEditor/TextEditorWidget.cpp @@ -246,8 +246,7 @@ TextEditorWidget::TextEditorWidget() }; m_find_regex_button = m_find_widget->add(".*"); - m_find_regex_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - m_find_regex_button->set_preferred_size(20, 0); + m_find_regex_button->set_fixed_width(20); m_find_regex_button->set_action(*m_find_regex_action); m_find_textbox->on_escape_pressed = [this] { diff --git a/Applications/TextEditor/TextEditorWindow.gml b/Applications/TextEditor/TextEditorWindow.gml index d766a57e0a..c01690959d 100644 --- a/Applications/TextEditor/TextEditorWindow.gml +++ b/Applications/TextEditor/TextEditorWindow.gml @@ -27,9 +27,7 @@ name: "find_replace_widget" visible: false fill_with_background_color: true - horizontal_size_policy: "Fill" - vertical_size_policy: "Fixed" - preferred_height: 48 + fixed_height: 48 layout: @GUI::VerticalBoxLayout { margins: [2, 2, 2, 4] @@ -38,9 +36,7 @@ @GUI::Widget { name: "find_widget" fill_with_background_color: true - horizontal_size_policy: "Fill" - vertical_size_policy: "Fixed" - preferred_height: 22 + fixed_height: 22 layout: @GUI::HorizontalBoxLayout { } @@ -48,26 +44,20 @@ @GUI::Button { name: "find_previous_button" text: "Find previous" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fill" - preferred_width: 150 + fixed_width: 150 } @GUI::Button { name: "find_next_button" text: "Find next" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fill" - preferred_width: 150 + fixed_width: 150 } } @GUI::Widget { name: "replace_widget" fill_with_background_color: true - horizontal_size_policy: "Fill" - vertical_size_policy: "Fixed" - preferred_height: 22 + fixed_height: 22 layout: @GUI::HorizontalBoxLayout { } @@ -75,25 +65,19 @@ @GUI::Button { name: "replace_previous_button" text: "Replace previous" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fill" - preferred_width: 100 + fixed_width: 100 } @GUI::Button { name: "replace_next_button" text: "Replace next" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fill" - preferred_width: 100 + fixed_width: 100 } @GUI::Button { name: "replace_all_button" text: "Replace all" - horizontal_size_policy: "Fixed" - vertical_size_policy: "Fill" - preferred_width: 100 + fixed_width: 100 } } } diff --git a/Applications/ThemeEditor/main.cpp b/Applications/ThemeEditor/main.cpp index f4675c19d7..d4a5936770 100644 --- a/Applications/ThemeEditor/main.cpp +++ b/Applications/ThemeEditor/main.cpp @@ -99,13 +99,11 @@ int main(int argc, char** argv) main_widget.set_layout(); auto& preview_widget = main_widget.add(app->palette()); - preview_widget.set_preferred_size(480, 360); - preview_widget.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); + preview_widget.set_fixed_size(480, 360); auto& horizontal_container = main_widget.add(); horizontal_container.set_layout(); - horizontal_container.set_preferred_size(480, 20); - horizontal_container.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); + horizontal_container.set_fixed_size(480, 20); auto& combo_box = horizontal_container.add(); auto& color_input = horizontal_container.add(); diff --git a/Applications/Welcome/TextWidget.cpp b/Applications/Welcome/TextWidget.cpp index 5bce4bf9d1..263d4514f8 100644 --- a/Applications/Welcome/TextWidget.cpp +++ b/Applications/Welcome/TextWidget.cpp @@ -136,6 +136,5 @@ void TextWidget::wrap_and_set_height() m_lines = lines; - set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - set_preferred_size(0, m_lines.size() * m_line_height + frame_thickness() * 2); + set_fixed_height(m_lines.size() * m_line_height + frame_thickness() * 2); } diff --git a/Applications/Welcome/main.cpp b/Applications/Welcome/main.cpp index 3f99184262..78c4d70889 100644 --- a/Applications/Welcome/main.cpp +++ b/Applications/Welcome/main.cpp @@ -148,7 +148,6 @@ int main(int argc, char** argv) background.set_layout(); background.layout()->set_margins({ 16, 8, 16, 8 }); background.layout()->set_spacing(8); - background.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); // // header @@ -158,8 +157,7 @@ int main(int argc, char** argv) header.set_font(Gfx::Font::load_from_file("/res/fonts/PebbletonBold14.font")); header.set_text("Welcome to SerenityOS!"); header.set_text_alignment(Gfx::TextAlignment::CenterLeft); - header.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - header.set_preferred_size(0, 30); + header.set_fixed_height(30); // // main section @@ -169,17 +167,14 @@ int main(int argc, char** argv) main_section.set_layout(); main_section.layout()->set_margins({ 0, 0, 0, 0 }); main_section.layout()->set_spacing(8); - main_section.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); auto& menu = main_section.add(); menu.set_layout(); menu.layout()->set_margins({ 0, 0, 0, 0 }); menu.layout()->set_spacing(4); - menu.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - menu.set_preferred_size(100, 0); + menu.set_fixed_width(100); auto& stack = main_section.add(); - stack.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); bool first = true; for (auto& page : pages) { @@ -187,18 +182,15 @@ int main(int argc, char** argv) content.set_layout(); content.layout()->set_margins({ 0, 0, 0, 0 }); content.layout()->set_spacing(8); - content.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); auto& title_box = content.add(); title_box.set_layout(); title_box.layout()->set_spacing(4); - title_box.set_preferred_size(0, 16); - title_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); + title_box.set_fixed_height(16); if (!page.icon.is_empty()) { auto& icon = title_box.add(); - icon.set_preferred_size(16, 16); - icon.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); + icon.set_fixed_size(16, 16); icon.load_from_file(page.icon); } @@ -206,8 +198,7 @@ int main(int argc, char** argv) content_title.set_font(Gfx::Font::default_bold_font()); content_title.set_text(page.title); content_title.set_text_alignment(Gfx::TextAlignment::CenterLeft); - content_title.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - content_title.set_preferred_size(0, 10); + content_title.set_fixed_height(10); for (auto& paragraph : page.content) { auto& content_text = content.add(); @@ -222,8 +213,7 @@ int main(int argc, char** argv) menu_option.set_font(Gfx::Font::default_font()); menu_option.set_text(page.menu_name); menu_option.set_text_alignment(Gfx::TextAlignment::CenterLeft); - menu_option.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - menu_option.set_preferred_size(0, 20); + menu_option.set_fixed_height(20); menu_option.set_checkable(true); menu_option.set_exclusive(true); diff --git a/Demos/DynamicObject/main.cpp b/Demos/DynamicObject/main.cpp index 1c5be8427c..d4f03ae5ac 100644 --- a/Demos/DynamicObject/main.cpp +++ b/Demos/DynamicObject/main.cpp @@ -68,8 +68,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv, [[maybe_unused auto& button = main_widget.add(); button.set_text("Good-bye"); - button.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - button.set_preferred_size(0, 20); + button.set_fixed_height(20); button.on_click = [&](auto) { app->quit(); }; diff --git a/Demos/HelloWorld/main.cpp b/Demos/HelloWorld/main.cpp index 7f2b70fc54..da30d56554 100644 --- a/Demos/HelloWorld/main.cpp +++ b/Demos/HelloWorld/main.cpp @@ -68,8 +68,7 @@ int main(int argc, char** argv) auto& button = main_widget.add(); button.set_text("Good-bye"); - button.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - button.set_preferred_size(0, 20); + button.set_fixed_height(20); button.on_click = [&](auto) { app->quit(); }; diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp index c21c934da5..395db79396 100644 --- a/Demos/WidgetGallery/main.cpp +++ b/Demos/WidgetGallery/main.cpp @@ -125,23 +125,19 @@ int main(int argc, char** argv) auto& tab_widget = root_widget.add(); auto& tab_basic = tab_widget.add_tab("Basic"); - tab_basic.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); tab_basic.set_layout(); tab_basic.layout()->set_margins({ 8, 8, 8, 8 }); tab_basic.layout()->set_spacing(8); auto& radio_group_box = tab_basic.add(); radio_group_box.set_layout(); - radio_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); radio_group_box.layout()->set_margins({ 4, 4, 4, 4 }); auto& radio_button_vert_container = radio_group_box.add(); - radio_button_vert_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); radio_button_vert_container.set_layout(); radio_button_vert_container.layout()->set_margins({ 4, 9, 4, 4 }); auto& radio_button_container = radio_button_vert_container.add(); - radio_button_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); radio_button_container.set_layout(); auto& radio1 = radio_button_container.add("RadioButton 1"); @@ -151,32 +147,26 @@ int main(int argc, char** argv) radio3.set_enabled(false); auto& checklabelspin_container = tab_basic.add(); - checklabelspin_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); checklabelspin_container.set_layout(); auto& check_group_box = checklabelspin_container.add(); check_group_box.set_layout(); - check_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); check_group_box.layout()->set_margins({ 4, 12, 4, 4 }); auto& checkbox_container = check_group_box.add(); - checkbox_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); checkbox_container.set_layout(); checkbox_container.layout()->set_margins({ 4, 4, 4, 4 }); auto& label_container = check_group_box.add(); - label_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); label_container.set_layout(); label_container.layout()->set_margins({ 4, 4, 4, 4 }); auto& spin_group_box = checklabelspin_container.add(); spin_group_box.set_layout(); - spin_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); spin_group_box.layout()->set_margins({ 4, 4, 4, 4 }); spin_group_box.set_title("Spin boxes"); auto& spin_container = spin_group_box.add(); - spin_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); spin_container.set_layout(); spin_container.layout()->set_margins({ 4, 12, 4, 4 }); @@ -194,15 +184,12 @@ int main(int argc, char** argv) spinbox2.set_enabled(false); auto& button_container = tab_basic.add(); - button_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); button_container.set_layout(); auto& button_vert1_container = button_container.add(); - button_vert1_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); button_vert1_container.set_layout(); auto& button_vert2_container = button_container.add(); - button_vert2_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); button_vert2_container.set_layout(); auto& button1 = button_vert1_container.add("Button 1"); @@ -216,17 +203,14 @@ int main(int argc, char** argv) auto& text_group_box = tab_basic.add(); text_group_box.set_layout(); - text_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); text_group_box.set_title("Text boxes"); text_group_box.layout()->set_margins({ 8, 4, 8, 4 }); auto& textbox_vert1_container = text_group_box.add(); - textbox_vert1_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); textbox_vert1_container.set_layout(); textbox_vert1_container.layout()->set_margins({ 1, 12, 1, 4 }); auto& textbox_vert2_container = text_group_box.add(); - textbox_vert2_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); textbox_vert2_container.set_layout(); textbox_vert2_container.layout()->set_margins({ 1, 12, 1, 4 }); @@ -243,28 +227,23 @@ int main(int argc, char** argv) textbox4.set_mode(GUI::TextEditor::DisplayOnly); auto& combocolor_container = tab_basic.add(); - combocolor_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); combocolor_container.set_layout(); auto& combo_group_box = combocolor_container.add(); combo_group_box.set_layout(); - combo_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); combo_group_box.layout()->set_margins({ 4, 4, 4, 4 }); combo_group_box.set_title("Combo boxes"); auto& color_group_box = combocolor_container.add(); color_group_box.set_layout(); - color_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); color_group_box.layout()->set_margins({ 4, 4, 4, 4 }); color_group_box.set_title("Color pickers"); auto& combo_container = combo_group_box.add(); - combo_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); combo_container.set_layout(); combo_container.layout()->set_margins({ 4, 12, 4, 4 }); auto& color_container = color_group_box.add(); - color_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); color_container.set_layout(); color_container.layout()->set_margins({ 4, 12, 4, 4 }); @@ -283,23 +262,19 @@ int main(int argc, char** argv) combobox2.set_enabled(false); auto& color_input_enabled = color_container.add(); - color_input_enabled.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); color_input_enabled.set_color(Color::from_string("#961605ff").value()); color_input_enabled.set_color_picker_title("Select color for desktop"); auto& color_input_disabled = color_container.add(); - color_input_disabled.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); color_input_disabled.set_color(Color::from_string("#961605ff").value()); color_input_disabled.set_enabled(false); auto& tab_others = tab_widget.add_tab("Sliders"); - tab_others.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); tab_others.set_layout(); tab_others.layout()->set_margins({ 8, 8, 8, 8 }); tab_others.layout()->set_spacing(8); auto& vert_slider_group_box = tab_others.add(); - vert_slider_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); vert_slider_group_box.set_layout(); vert_slider_group_box.layout()->set_margins({ 4, 28, 4, 4 }); vert_slider_group_box.set_title("Vertical sliders"); @@ -315,18 +290,15 @@ int main(int argc, char** argv) vslider3.set_tooltip("Proportional"); auto& horizontal_slider_group_box = tab_others.add(); - horizontal_slider_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); horizontal_slider_group_box.set_layout(); horizontal_slider_group_box.layout()->set_margins({ 4, 12, 4, 4 }); horizontal_slider_group_box.set_title("Horizontal sliders"); auto& horizontal_slider_container = horizontal_slider_group_box.add(); - horizontal_slider_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); horizontal_slider_container.set_layout(); horizontal_slider_container.layout()->set_margins({ 4, 4, 4, 4 }); auto& horizontal_slider_container2 = horizontal_slider_group_box.add(); - horizontal_slider_container2.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); horizontal_slider_container2.set_layout(); horizontal_slider_container2.layout()->set_margins({ 4, 4, 4, 4 }); @@ -339,8 +311,7 @@ int main(int argc, char** argv) slider3.set_knob_size_mode(GUI::Slider::KnobSizeMode::Proportional); auto& progress1 = horizontal_slider_container2.add(); - progress1.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - progress1.set_preferred_size(0, 28); + progress1.set_fixed_height(28); slider1.on_value_changed = [&](int value) { progress1.set_value(value); @@ -354,7 +325,6 @@ int main(int argc, char** argv) }; auto& scroll_group_box = tab_others.add(); - scroll_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); scroll_group_box.set_layout(); scroll_group_box.layout()->set_margins({ 12, 12, 12, 12 }); scroll_group_box.set_title("Scrollbars"); @@ -362,8 +332,7 @@ int main(int argc, char** argv) scroll_group_box.layout()->add_spacer(); auto& scrollbar1 = scroll_group_box.add(Orientation::Horizontal); - scrollbar1.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - scrollbar1.set_preferred_size(0, 16); + scrollbar1.set_fixed_height(16); scrollbar1.set_min(0); scrollbar1.set_max(100); scrollbar1.set_value(50); @@ -371,14 +340,12 @@ int main(int argc, char** argv) scroll_group_box.layout()->add_spacer(); auto& scrollbar2 = scroll_group_box.add(Orientation::Horizontal); - scrollbar2.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - scrollbar2.set_preferred_size(0, 16); + scrollbar2.set_fixed_height(16); scrollbar2.set_enabled(false); scroll_group_box.layout()->add_spacer(); auto& tab_modals = tab_widget.add_tab("Modals"); - tab_modals.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); tab_modals.set_layout(); tab_modals.layout()->set_margins({ 8, 8, 8, 8 }); tab_modals.layout()->set_spacing(8); @@ -386,19 +353,16 @@ int main(int argc, char** argv) GUI::MessageBox::Type msg_box_type = GUI::MessageBox::Type::Error; auto& msgbox_group_container = tab_modals.add("Message boxes"); - msgbox_group_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); msgbox_group_container.set_layout(); msgbox_group_container.layout()->set_margins({ 4, 12, 4, 2 }); auto& msgbox_radio_container = msgbox_group_container.add(); - msgbox_radio_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); msgbox_radio_container.set_layout(); msgbox_radio_container.layout()->set_margins({ 4, 12, 4, 4 }); auto& icon_group_box = msgbox_radio_container.add("Icon"); icon_group_box.set_layout(); icon_group_box.layout()->set_margins({ 4, 16, 4, 4 }); - icon_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); auto& radio_none = icon_group_box.add("None"); radio_none.on_checked = [&](bool) { @@ -425,7 +389,6 @@ int main(int argc, char** argv) auto& button_group_box = msgbox_radio_container.add("Buttons"); button_group_box.set_layout(); button_group_box.layout()->set_margins({ 4, 16, 4, 4 }); - button_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); GUI::MessageBox::InputType msg_box_input_type = GUI::MessageBox::InputType::OKCancel; @@ -448,24 +411,20 @@ int main(int argc, char** argv) }; auto& msgbox_text_container = msgbox_group_container.add(); - msgbox_text_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); msgbox_text_container.set_layout(); - msgbox_text_container.set_preferred_size(0, 100); + msgbox_text_container.set_fixed_height(100); msgbox_text_container.layout()->set_margins({ 4, 8, 4, 8 }); auto& title_textbox = msgbox_text_container.add(); - title_textbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - title_textbox.set_preferred_size(0, 24); + title_textbox.set_fixed_height(24); title_textbox.set_text("Demo Title"); auto& content_textbox = msgbox_text_container.add(); - content_textbox.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - content_textbox.set_preferred_size(0, 24); + content_textbox.set_fixed_height(24); content_textbox.set_text("Demo text for message box."); auto& msgbox_button = msgbox_text_container.add("Create"); - msgbox_button.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - msgbox_button.set_preferred_size(0, 30); + msgbox_button.set_fixed_height(30); msgbox_button.on_click = [&](auto) { GUI::MessageBox::show(window, content_textbox.text(), title_textbox.text(), msg_box_type, msg_box_input_type); }; @@ -473,8 +432,7 @@ int main(int argc, char** argv) auto& input_group_box = tab_modals.add("Input boxes"); input_group_box.set_layout(); input_group_box.layout()->set_margins({ 4, 12, 4, 4 }); - input_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - input_group_box.set_preferred_size(0, 160); + input_group_box.set_fixed_height(160); input_group_box.layout()->add_spacer(); @@ -484,13 +442,11 @@ int main(int argc, char** argv) input_group_box.layout()->add_spacer(); auto& input_button_container = input_group_box.add(); - input_button_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); input_button_container.set_layout(); input_button_container.layout()->set_margins({ 4, 0, 4, 0 }); auto& input_button = input_button_container.add("Input..."); - input_button.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - input_button.set_preferred_size(0, 30); + input_button.set_fixed_height(30); String value; input_button.on_click = [&](auto) { if (GUI::InputBox::show(value, window, "Enter input:", "Input Box") == GUI::InputBox::ExecOK && !value.is_empty()) @@ -498,7 +454,6 @@ int main(int argc, char** argv) }; auto& tab_image = tab_widget.add_tab("Images"); - tab_image.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); tab_image.set_layout(); tab_image.layout()->set_margins({ 8, 8, 8, 8 }); tab_image.layout()->set_spacing(8); @@ -511,14 +466,12 @@ int main(int argc, char** argv) gif_animation_image.load_from_file("/res/graphics/download-animation.gif"); auto& tab_cursors = tab_widget.add_tab("Cursors"); - tab_cursors.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); tab_cursors.set_layout(); tab_cursors.layout()->set_margins({ 8, 8, 8, 8 }); tab_cursors.layout()->set_spacing(8); auto& cursor_group_box = tab_cursors.add("Cursor"); cursor_group_box.set_layout(); - cursor_group_box.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); cursor_group_box.layout()->set_margins({ 4, 12, 4, 4 }); auto& radio_cursor_none = cursor_group_box.add("None"); diff --git a/DevTools/HackStudio/Debugger/DisassemblyWidget.cpp b/DevTools/HackStudio/Debugger/DisassemblyWidget.cpp index 893d8dac82..9602d90392 100644 --- a/DevTools/HackStudio/Debugger/DisassemblyWidget.cpp +++ b/DevTools/HackStudio/Debugger/DisassemblyWidget.cpp @@ -48,11 +48,9 @@ DisassemblyWidget::DisassemblyWidget() m_top_container = add(); m_top_container->set_layout(); - m_top_container->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_top_container->set_preferred_size(0, 20); + m_top_container->set_fixed_height(20); m_function_name_label = m_top_container->add(""); - m_function_name_label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); m_disassembly_view = add(); diff --git a/DevTools/HackStudio/EditorWrapper.cpp b/DevTools/HackStudio/EditorWrapper.cpp index e2f51cfbc5..c21396f251 100644 --- a/DevTools/HackStudio/EditorWrapper.cpp +++ b/DevTools/HackStudio/EditorWrapper.cpp @@ -40,21 +40,18 @@ EditorWrapper::EditorWrapper() set_layout(); auto& label_wrapper = add(); - label_wrapper.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - label_wrapper.set_preferred_size(0, 14); + label_wrapper.set_fixed_height(14); label_wrapper.set_fill_with_background_color(true); label_wrapper.set_layout(); label_wrapper.layout()->set_margins({ 2, 0, 2, 0 }); m_filename_label = label_wrapper.add("(Untitled)"); m_filename_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - m_filename_label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_filename_label->set_preferred_size(0, 14); + m_filename_label->set_fixed_height(14); m_cursor_label = label_wrapper.add("(Cursor)"); m_cursor_label->set_text_alignment(Gfx::TextAlignment::CenterRight); - m_cursor_label->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_cursor_label->set_preferred_size(0, 14); + m_cursor_label->set_fixed_height(14); m_editor = add(); m_editor->set_ruler_visible(true); diff --git a/DevTools/HackStudio/FindInFilesWidget.cpp b/DevTools/HackStudio/FindInFilesWidget.cpp index 8491379013..7c823ed42b 100644 --- a/DevTools/HackStudio/FindInFilesWidget.cpp +++ b/DevTools/HackStudio/FindInFilesWidget.cpp @@ -138,15 +138,12 @@ FindInFilesWidget::FindInFilesWidget() auto& top_container = add(); top_container.set_layout(); - top_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - top_container.set_preferred_size(0, 20); + top_container.set_fixed_height(20); m_textbox = top_container.add(); - m_textbox->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill); m_button = top_container.add("Find in files"); - m_button->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - m_button->set_preferred_size(100, 0); + m_button->set_fixed_width(100); m_result_view = add(); diff --git a/DevTools/HackStudio/Git/GitWidget.cpp b/DevTools/HackStudio/Git/GitWidget.cpp index 265eb6f98c..95ef6928ec 100644 --- a/DevTools/HackStudio/Git/GitWidget.cpp +++ b/DevTools/HackStudio/Git/GitWidget.cpp @@ -54,16 +54,14 @@ GitWidget::GitWidget(const LexicalPath& repo_root) auto& refresh_button = unstaged_header.add(); refresh_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png")); - refresh_button.set_preferred_size({ 16, 16 }); - refresh_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); + refresh_button.set_fixed_size(16, 16); refresh_button.set_tooltip("refresh"); refresh_button.on_click = [this](int) { refresh(); }; auto& unstaged_label = unstaged_header.add(); unstaged_label.set_text("Unstaged"); - unstaged_header.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - unstaged_header.set_preferred_size(0, 20); + unstaged_header.set_fixed_height(20); m_unstaged_files = unstaged.add( [this](const auto& file) { stage_file(file); }, Gfx::Bitmap::load_from_file("/res/icons/16x16/plus.png").release_nonnull()); @@ -80,16 +78,14 @@ GitWidget::GitWidget(const LexicalPath& repo_root) auto& commit_button = staged_header.add(); commit_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/commit.png")); - commit_button.set_preferred_size({ 16, 16 }); - commit_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); + commit_button.set_fixed_size(16, 16); commit_button.set_tooltip("commit"); commit_button.on_click = [this](int) { commit(); }; auto& staged_label = staged_header.add(); staged_label.set_text("Staged"); - staged_header.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - staged_header.set_preferred_size(0, 20); + staged_header.set_fixed_height(20); m_staged_files = staged.add( [this](const auto& file) { unstage_file(file); }, Gfx::Bitmap::load_from_file("/res/icons/16x16/minus.png").release_nonnull()); diff --git a/DevTools/HackStudio/HackStudioWidget.cpp b/DevTools/HackStudio/HackStudioWidget.cpp index e373664110..588c3ee80b 100644 --- a/DevTools/HackStudio/HackStudioWidget.cpp +++ b/DevTools/HackStudio/HackStudioWidget.cpp @@ -100,8 +100,7 @@ HackStudioWidget::HackStudioWidget(const String& path_to_project) auto& outer_splitter = add(); auto& left_hand_splitter = outer_splitter.add(); - left_hand_splitter.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - left_hand_splitter.set_preferred_size(150, 0); + left_hand_splitter.set_fixed_width(150); create_project_tree_view(left_hand_splitter); m_project_tree_view_context_menu = create_project_tree_view_context_menu(); @@ -494,8 +493,8 @@ NonnullRefPtr HackStudioWidget::create_add_terminal_action() void HackStudioWidget::reveal_action_tab(GUI::Widget& widget) { - if (m_action_tab_widget->preferred_size().height() < 200) - m_action_tab_widget->set_preferred_size(0, 200); + if (m_action_tab_widget->min_height() < 200) + m_action_tab_widget->set_fixed_height(200); m_action_tab_widget->set_active_widget(&widget); } @@ -617,7 +616,7 @@ void HackStudioWidget::run(TerminalWrapper& wrapper) void HackStudioWidget::hide_action_tabs() { - m_action_tab_widget->set_preferred_size(0, 24); + m_action_tab_widget->set_fixed_height(24); }; Project& HackStudioWidget::project() @@ -673,7 +672,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent) m_form_inner_container = parent.add(); m_form_inner_container->set_layout(); auto& form_widgets_toolbar = m_form_inner_container->add(Orientation::Vertical, 26); - form_widgets_toolbar.set_preferred_size(38, 0); + form_widgets_toolbar.set_fixed_width(38); GUI::ActionGroup tool_actions; tool_actions.set_exclusive(true); @@ -710,8 +709,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent) m_form_editor_widget = form_editor_inner_splitter.add(); auto& form_editing_pane_container = form_editor_inner_splitter.add(); - form_editing_pane_container.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - form_editing_pane_container.set_preferred_size(190, 0); + form_editing_pane_container.set_fixed_width(190); form_editing_pane_container.set_layout(); auto add_properties_pane = [&](auto& text, auto& pane_widget) { @@ -721,8 +719,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent) label.set_fill_with_background_color(true); label.set_text_alignment(Gfx::TextAlignment::CenterLeft); label.set_font(Gfx::Font::default_bold_font()); - label.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - label.set_preferred_size(0, 16); + label.set_fixed_height(16); wrapper.add_child(pane_widget); }; @@ -803,14 +800,13 @@ void HackStudioWidget::create_action_tab(GUI::Widget& parent) { m_action_tab_widget = parent.add(); - m_action_tab_widget->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - m_action_tab_widget->set_preferred_size(0, 24); + m_action_tab_widget->set_fixed_height(24); m_action_tab_widget->on_change = [this](auto&) { on_action_tab_change(); static bool first_time = true; if (!first_time) - m_action_tab_widget->set_preferred_size(0, 200); + m_action_tab_widget->set_fixed_height(200); first_time = false; }; diff --git a/DevTools/HackStudio/Locator.cpp b/DevTools/HackStudio/Locator.cpp index f207df2985..50c16fde1e 100644 --- a/DevTools/HackStudio/Locator.cpp +++ b/DevTools/HackStudio/Locator.cpp @@ -69,8 +69,7 @@ private: Locator::Locator() { set_layout(); - set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - set_preferred_size(0, 20); + set_fixed_height(20); m_textbox = add(); m_textbox->on_change = [this] { update_suggestions(); diff --git a/DevTools/Inspector/main.cpp b/DevTools/Inspector/main.cpp index 0591313f80..2e30792068 100644 --- a/DevTools/Inspector/main.cpp +++ b/DevTools/Inspector/main.cpp @@ -128,8 +128,7 @@ int main(int argc, char** argv) auto& tree_view = splitter.add(); tree_view.set_model(remote_process.object_graph_model()); tree_view.set_activates_on_selection(true); - tree_view.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - tree_view.set_preferred_size(286, 0); + tree_view.set_fixed_width(286); auto& properties_tree_view = splitter.add(); properties_tree_view.set_editable(true); diff --git a/DevTools/Profiler/ProfileTimelineWidget.cpp b/DevTools/Profiler/ProfileTimelineWidget.cpp index 025af2c5f9..bbaf38973f 100644 --- a/DevTools/Profiler/ProfileTimelineWidget.cpp +++ b/DevTools/Profiler/ProfileTimelineWidget.cpp @@ -33,8 +33,7 @@ ProfileTimelineWidget::ProfileTimelineWidget(Profile& profile) { set_background_color(Color::White); set_fill_with_background_color(true); - set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - set_preferred_size(0, 80); + set_fixed_height(80); } ProfileTimelineWidget::~ProfileTimelineWidget() diff --git a/DevTools/Profiler/main.cpp b/DevTools/Profiler/main.cpp index 38f3ebc3ee..fb157979e8 100644 --- a/DevTools/Profiler/main.cpp +++ b/DevTools/Profiler/main.cpp @@ -176,8 +176,7 @@ static bool prompt_to_stop_profiling(pid_t pid, const String& process_name) }); auto& stop_button = widget.add("Stop"); - stop_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed); - stop_button.set_preferred_size(140, 22); + stop_button.set_fixed_size(140, 22); stop_button.on_click = [&](auto) { GUI::Application::the()->quit(); }; diff --git a/Games/Minesweeper/Field.cpp b/Games/Minesweeper/Field.cpp index 0abe27ce05..bfe1bddd4a 100644 --- a/Games/Minesweeper/Field.cpp +++ b/Games/Minesweeper/Field.cpp @@ -509,9 +509,9 @@ void Field::set_field_size(size_t rows, size_t columns, size_t mine_count) m_rows = rows; m_columns = columns; m_mine_count = mine_count; - set_preferred_size(frame_thickness() * 2 + m_columns * square_size(), frame_thickness() * 2 + m_rows * square_size()); + set_fixed_size(frame_thickness() * 2 + m_columns * square_size(), frame_thickness() * 2 + m_rows * square_size()); reset(); - m_on_size_changed(preferred_size()); + m_on_size_changed(min_size()); } void Field::set_single_chording(bool enabled) diff --git a/Games/Minesweeper/main.cpp b/Games/Minesweeper/main.cpp index e9358abfe5..83d808d307 100644 --- a/Games/Minesweeper/main.cpp +++ b/Games/Minesweeper/main.cpp @@ -83,8 +83,7 @@ int main(int argc, char** argv) auto& container = widget.add(); container.set_fill_with_background_color(true); - container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed); - container.set_preferred_size(0, 36); + container.set_fixed_height(36); container.set_layout(); auto& flag_image = container.add(); @@ -93,15 +92,14 @@ int main(int argc, char** argv) auto& flag_label = container.add(); auto& face_button = container.add(); face_button.set_button_style(Gfx::ButtonStyle::CoolBar); - face_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill); - face_button.set_preferred_size(36, 0); + face_button.set_fixed_width(36); auto& time_image = container.add(); time_image.load_from_file("/res/icons/minesweeper/timer.png"); auto& time_label = container.add(); auto& field = widget.add(flag_label, time_label, face_button, [&](auto size) { - size.set_height(size.height() + container.preferred_size().height()); + size.set_height(size.height() + container.min_size().height()); window->resize(size); }); diff --git a/Libraries/LibGUI/AboutDialog.cpp b/Libraries/LibGUI/AboutDialog.cpp index 3dde585e0d..8021b05d2f 100644 --- a/Libraries/LibGUI/AboutDialog.cpp +++ b/Libraries/LibGUI/AboutDialog.cpp @@ -57,19 +57,16 @@ AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Window banner_image.load_from_file("/res/graphics/brand-banner.png"); auto& content_container = widget.add(); - content_container.set_size_policy(SizePolicy::Fill, SizePolicy::Fill); content_container.set_layout(); auto& left_container = content_container.add(); - left_container.set_size_policy(SizePolicy::Fixed, SizePolicy::Fill); - left_container.set_preferred_size(60, 0); + left_container.set_fixed_width(60); left_container.set_layout(); left_container.layout()->set_margins({ 0, 12, 0, 0 }); if (icon) { auto& icon_wrapper = left_container.add(); - icon_wrapper.set_size_policy(SizePolicy::Fixed, SizePolicy::Fixed); - icon_wrapper.set_preferred_size(32, 48); + icon_wrapper.set_fixed_size(32, 48); icon_wrapper.set_layout(); auto& icon_image = icon_wrapper.add(); @@ -83,8 +80,7 @@ AboutDialog::AboutDialog(const StringView& name, const Gfx::Bitmap* icon, Window auto make_label = [&](const StringView& text, bool bold = false) { auto& label = right_container.add