RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 15:32:46 +00:00
Code Issues Activity Actions

Userland: Use non-fallible EventReceiver::add() where possible

Browse source
This commit is contained in:
Tim Ledbetter 2023-09-22 22:28:59 +01:00 • committed by Andreas Kling
parent 707ca984bd
commit b4e134cb52
54 changed files with 934 additions and 934 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Base/res/devel/templates/serenity-application/main.cpp
View file

@ -24,8 +24,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
main_widget->set_layout<GUI::VerticalBoxLayout>(16); main_widget->set_layout<GUI::VerticalBoxLayout>(16);
auto button = TRY(main_widget->try_add<GUI::Button>("Click me!"_string)); auto& button = main_widget->add<GUI::Button>("Click me!"_string);
button->on_click = [&](auto) { button.on_click = [&](auto) {
GUI::MessageBox::show(window, "Hello friends!"sv, ":^)"sv); GUI::MessageBox::show(window, "Hello friends!"sv, ":^)"sv);
}; };

66
Userland/Applications/CrashReporter/main.cpp
View file

@ -239,41 +239,41 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& backtrace_tab = tab_widget.add_tab<GUI::Widget>("Backtrace"_string); auto& backtrace_tab = tab_widget.add_tab<GUI::Widget>("Backtrace"_string);
backtrace_tab.set_layout<GUI::VerticalBoxLayout>(4); backtrace_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto backtrace_label = TRY(backtrace_tab.try_add<GUI::Label>("A backtrace for each thread alive during the crash is listed below:"_string)); auto& backtrace_label = backtrace_tab.add<GUI::Label>("A backtrace for each thread alive during the crash is listed below:"_string);
backtrace_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); backtrace_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
backtrace_label->set_fixed_height(16); backtrace_label.set_fixed_height(16);
auto backtrace_tab_widget = TRY(backtrace_tab.try_add<GUI::TabWidget>()); auto& backtrace_tab_widget = backtrace_tab.add<GUI::TabWidget>();
backtrace_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); backtrace_tab_widget.set_tab_position(GUI::TabWidget::TabPosition::Bottom);
auto& cpu_registers_tab = tab_widget.add_tab<GUI::Widget>("CPU Registers"_string); auto& cpu_registers_tab = tab_widget.add_tab<GUI::Widget>("CPU Registers"_string);
cpu_registers_tab.set_layout<GUI::VerticalBoxLayout>(4); cpu_registers_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto cpu_registers_label = TRY(cpu_registers_tab.try_add<GUI::Label>("The CPU register state for each thread alive during the crash is listed below:"_string)); auto& cpu_registers_label = cpu_registers_tab.add<GUI::Label>("The CPU register state for each thread alive during the crash is listed below:"_string);
cpu_registers_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); cpu_registers_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
cpu_registers_label->set_fixed_height(16); cpu_registers_label.set_fixed_height(16);
auto cpu_registers_tab_widget = TRY(cpu_registers_tab.try_add<GUI::TabWidget>()); auto& cpu_registers_tab_widget = cpu_registers_tab.add<GUI::TabWidget>();
cpu_registers_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); cpu_registers_tab_widget.set_tab_position(GUI::TabWidget::TabPosition::Bottom);
auto& environment_tab = tab_widget.add_tab<GUI::Widget>("Environment"_string); auto& environment_tab = tab_widget.add_tab<GUI::Widget>("Environment"_string);
environment_tab.set_layout<GUI::VerticalBoxLayout>(4); environment_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto environment_text_editor = TRY(environment_tab.try_add<GUI::TextEditor>()); auto& environment_text_editor = environment_tab.add<GUI::TextEditor>();
environment_text_editor->set_text(DeprecatedString::join('\n', environment)); environment_text_editor.set_text(DeprecatedString::join('\n', environment));
environment_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); environment_text_editor.set_mode(GUI::TextEditor::Mode::ReadOnly);
environment_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); environment_text_editor.set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
environment_text_editor->set_should_hide_unnecessary_scrollbars(true); environment_text_editor.set_should_hide_unnecessary_scrollbars(true);
auto& memory_regions_tab = tab_widget.add_tab<GUI::Widget>("Memory Regions"_string); auto& memory_regions_tab = tab_widget.add_tab<GUI::Widget>("Memory Regions"_string);
memory_regions_tab.set_layout<GUI::VerticalBoxLayout>(4); memory_regions_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto memory_regions_text_editor = TRY(memory_regions_tab.try_add<GUI::TextEditor>()); auto& memory_regions_text_editor = memory_regions_tab.add<GUI::TextEditor>();
memory_regions_text_editor->set_text(DeprecatedString::join('\n', memory_regions)); memory_regions_text_editor.set_text(DeprecatedString::join('\n', memory_regions));
memory_regions_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); memory_regions_text_editor.set_mode(GUI::TextEditor::Mode::ReadOnly);
memory_regions_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); memory_regions_text_editor.set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
memory_regions_text_editor->set_should_hide_unnecessary_scrollbars(true); memory_regions_text_editor.set_should_hide_unnecessary_scrollbars(true);
memory_regions_text_editor->set_visualize_trailing_whitespace(false); memory_regions_text_editor.set_visualize_trailing_whitespace(false);
auto& close_button = *widget->find_descendant_of_type_named<GUI::Button>("close_button"); auto& close_button = *widget->find_descendant_of_type_named<GUI::Button>("close_button");
close_button.on_click = [&](auto) { close_button.on_click = [&](auto) {
@ -330,24 +330,24 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}, },
[&](auto results) -> ErrorOr<void> { [&](auto results) -> ErrorOr<void> {
for (auto& backtrace : results.thread_backtraces) { for (auto& backtrace : results.thread_backtraces) {
auto& container = backtrace_tab_widget->add_tab<GUI::Widget>(TRY(String::from_deprecated_string(backtrace.title))); auto& container = backtrace_tab_widget.add_tab<GUI::Widget>(TRY(String::from_deprecated_string(backtrace.title)));
container.template set_layout<GUI::VerticalBoxLayout>(4); container.template set_layout<GUI::VerticalBoxLayout>(4);
auto backtrace_text_editor = TRY(container.template try_add<GUI::TextEditor>()); auto& backtrace_text_editor = container.template add<GUI::TextEditor>();
backtrace_text_editor->set_text(backtrace.text); backtrace_text_editor.set_text(backtrace.text);
backtrace_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); backtrace_text_editor.set_mode(GUI::TextEditor::Mode::ReadOnly);
backtrace_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); backtrace_text_editor.set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
backtrace_text_editor->set_should_hide_unnecessary_scrollbars(true); backtrace_text_editor.set_should_hide_unnecessary_scrollbars(true);
TRY(full_backtrace.try_appendff("==== {} ====\n{}\n", backtrace.title, backtrace.text)); TRY(full_backtrace.try_appendff("==== {} ====\n{}\n", backtrace.title, backtrace.text));
} }
for (auto& cpu_registers : results.thread_cpu_registers) { for (auto& cpu_registers : results.thread_cpu_registers) {
auto& container = cpu_registers_tab_widget->add_tab<GUI::Widget>(TRY(String::from_deprecated_string(cpu_registers.title))); auto& container = cpu_registers_tab_widget.add_tab<GUI::Widget>(TRY(String::from_deprecated_string(cpu_registers.title)));
container.template set_layout<GUI::VerticalBoxLayout>(4); container.template set_layout<GUI::VerticalBoxLayout>(4);
auto cpu_registers_text_editor = TRY(container.template try_add<GUI::TextEditor>()); auto& cpu_registers_text_editor = container.template add<GUI::TextEditor>();
cpu_registers_text_editor->set_text(cpu_registers.text); cpu_registers_text_editor.set_text(cpu_registers.text);
cpu_registers_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); cpu_registers_text_editor.set_mode(GUI::TextEditor::Mode::ReadOnly);
cpu_registers_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); cpu_registers_text_editor.set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
cpu_registers_text_editor->set_should_hide_unnecessary_scrollbars(true); cpu_registers_text_editor.set_should_hide_unnecessary_scrollbars(true);
} }
progressbar.set_visible(false); progressbar.set_visible(false);

14
Userland/Applications/FileManager/PropertiesWindow.cpp
View file

@ -74,15 +74,15 @@ ErrorOr<void> PropertiesWindow::create_widgets(bool disable_rename)
main_widget->set_layout<GUI::VerticalBoxLayout>(4, 6); main_widget->set_layout<GUI::VerticalBoxLayout>(4, 6);
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
auto tab_widget = TRY(main_widget->try_add<GUI::TabWidget>()); auto& tab_widget = main_widget->add<GUI::TabWidget>();
TRY(create_general_tab(tab_widget, disable_rename)); TRY(create_general_tab(tab_widget, disable_rename));
TRY(create_file_type_specific_tabs(tab_widget)); TRY(create_file_type_specific_tabs(tab_widget));
auto button_widget = TRY(main_widget->try_add<GUI::Widget>()); auto& button_widget = main_widget->add<GUI::Widget>();
button_widget->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 5); button_widget.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 5);
button_widget->set_fixed_height(22); button_widget.set_fixed_height(22);
button_widget->add_spacer(); button_widget.add_spacer();
auto ok_button = TRY(make_button("OK"_string, button_widget)); auto ok_button = TRY(make_button("OK"_string, button_widget));
ok_button->on_click = [this](auto) { ok_button->on_click = [this](auto) {
@ -594,8 +594,8 @@ ErrorOr<void> PropertiesWindow::setup_permission_checkboxes(GUI::CheckBox& box_r
ErrorOr<NonnullRefPtr<GUI::Button>> PropertiesWindow::make_button(String text, GUI::Widget& parent) ErrorOr<NonnullRefPtr<GUI::Button>> PropertiesWindow::make_button(String text, GUI::Widget& parent)
{ {
auto button = TRY(parent.try_add<GUI::Button>(text)); auto& button = parent.add<GUI::Button>(text);
button->set_fixed_size(70, 22); button.set_fixed_size(70, 22);
return button; return button;
} }

114
Userland/Applications/ImageViewer/main.cpp
View file

@ -72,24 +72,24 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto root_widget = window->set_main_widget<MainWidget>(); auto root_widget = window->set_main_widget<MainWidget>();
auto toolbar_container = TRY(root_widget->try_add<GUI::ToolbarContainer>()); auto& toolbar_container = root_widget->add<GUI::ToolbarContainer>();
auto main_toolbar = TRY(toolbar_container->try_add<GUI::Toolbar>()); auto& main_toolbar = toolbar_container.add<GUI::Toolbar>();
auto widget = TRY(root_widget->try_add<ViewWidget>()); auto& widget = root_widget->add<ViewWidget>();
widget->on_scale_change = [&](float scale) { widget.on_scale_change = [&](float scale) {
if (!widget->image()) { if (!widget.image()) {
window->set_title("Image Viewer"); window->set_title("Image Viewer");
return; return;
} }
window->set_title(DeprecatedString::formatted("{} {} {}% - Image Viewer", widget->path(), widget->image()->size().to_deprecated_string(), (int)(scale * 100))); window->set_title(DeprecatedString::formatted("{} {} {}% - Image Viewer", widget.path(), widget.image()->size().to_deprecated_string(), (int)(scale * 100)));
if (!widget->scaled_for_first_image()) { if (!widget.scaled_for_first_image()) {
widget->set_scaled_for_first_image(true); widget.set_scaled_for_first_image(true);
widget->resize_window(); widget.resize_window();
} }
}; };
widget->on_drop = [&](auto& event) { widget.on_drop = [&](auto& event) {
if (!event.mime_data().has_urls()) if (!event.mime_data().has_urls())
return; return;
@ -106,16 +106,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return; return;
auto value = result.release_value(); auto value = result.release_value();
widget->open_file(value.filename(), value.stream()); widget.open_file(value.filename(), value.stream());
for (size_t i = 1; i < urls.size(); ++i) { for (size_t i = 1; i < urls.size(); ++i) {
Desktop::Launcher::open(URL::create_with_file_scheme(urls[i].serialize_path().characters()), "/bin/ImageViewer"); Desktop::Launcher::open(URL::create_with_file_scheme(urls[i].serialize_path().characters()), "/bin/ImageViewer");
} }
}; };
widget->on_doubleclick = [&] { widget.on_doubleclick = [&] {
window->set_fullscreen(!window->is_fullscreen()); window->set_fullscreen(!window->is_fullscreen());
toolbar_container->set_visible(!window->is_fullscreen()); toolbar_container.set_visible(!window->is_fullscreen());
widget->set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer); widget.set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer);
}; };
// Actions // Actions
@ -130,12 +130,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return; return;
auto value = result.release_value(); auto value = result.release_value();
widget->open_file(value.filename(), value.stream()); widget.open_file(value.filename(), value.stream());
}); });
auto delete_action = GUI::CommonActions::make_delete_action( auto delete_action = GUI::CommonActions::make_delete_action(
[&](auto&) { [&](auto&) {
auto path = widget->path(); auto path = widget.path();
if (path.is_empty()) if (path.is_empty())
return; return;
@ -148,7 +148,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (msgbox_result == GUI::MessageBox::ExecResult::Cancel) if (msgbox_result == GUI::MessageBox::ExecResult::Cancel)
return; return;
auto unlinked_or_error = Core::System::unlink(widget->path()); auto unlinked_or_error = Core::System::unlink(widget.path());
if (unlinked_or_error.is_error()) { if (unlinked_or_error.is_error()) {
GUI::MessageBox::show(window, GUI::MessageBox::show(window,
DeprecatedString::formatted("unlink({}) failed: {}", path, unlinked_or_error.error()), DeprecatedString::formatted("unlink({}) failed: {}", path, unlinked_or_error.error()),
@ -158,7 +158,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return; return;
} }
widget->clear(); widget.clear();
}); });
auto quit_action = GUI::CommonActions::make_quit_action( auto quit_action = GUI::CommonActions::make_quit_action(
@ -167,28 +167,28 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}); });
auto rotate_counterclockwise_action = GUI::CommonActions::make_rotate_counterclockwise_action([&](auto&) { auto rotate_counterclockwise_action = GUI::CommonActions::make_rotate_counterclockwise_action([&](auto&) {
widget->rotate(Gfx::RotationDirection::CounterClockwise); widget.rotate(Gfx::RotationDirection::CounterClockwise);
}); });
auto rotate_clockwise_action = GUI::CommonActions::make_rotate_clockwise_action([&](auto&) { auto rotate_clockwise_action = GUI::CommonActions::make_rotate_clockwise_action([&](auto&) {
widget->rotate(Gfx::RotationDirection::Clockwise); widget.rotate(Gfx::RotationDirection::Clockwise);
}); });
auto vertical_flip_action = GUI::Action::create("Flip &Vertically", { Mod_None, Key_V }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-flip-vertical.png"sv)), auto vertical_flip_action = GUI::Action::create("Flip &Vertically", { Mod_None, Key_V }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-flip-vertical.png"sv)),
[&](auto&) { [&](auto&) {
widget->flip(Gfx::Orientation::Vertical); widget.flip(Gfx::Orientation::Vertical);
}); });
auto horizontal_flip_action = GUI::Action::create("Flip &Horizontally", { Mod_None, Key_H }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-flip-horizontal.png"sv)), auto horizontal_flip_action = GUI::Action::create("Flip &Horizontally", { Mod_None, Key_H }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-flip-horizontal.png"sv)),
[&](auto&) { [&](auto&) {
widget->flip(Gfx::Orientation::Horizontal); widget.flip(Gfx::Orientation::Horizontal);
}); });
auto desktop_wallpaper_action = GUI::Action::create("Set as Desktop &Wallpaper", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-display-settings.png"sv)), auto desktop_wallpaper_action = GUI::Action::create("Set as Desktop &Wallpaper", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-display-settings.png"sv)),
[&](auto&) { [&](auto&) {
if (!GUI::Desktop::the().set_wallpaper(widget->image()->bitmap(GUI::Desktop::the().rect().size()).release_value_but_fixme_should_propagate_errors(), widget->path())) { if (!GUI::Desktop::the().set_wallpaper(widget.image()->bitmap(GUI::Desktop::the().rect().size()).release_value_but_fixme_should_propagate_errors(), widget.path())) {
GUI::MessageBox::show(window, GUI::MessageBox::show(window,
DeprecatedString::formatted("set_wallpaper({}) failed", widget->path()), DeprecatedString::formatted("set_wallpaper({}) failed", widget.path()),
"Could not set wallpaper"sv, "Could not set wallpaper"sv,
GUI::MessageBox::Type::Error); GUI::MessageBox::Type::Error);
} }
@ -196,84 +196,84 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto go_first_action = GUI::Action::create("&Go to First", { Mod_None, Key_Home }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-first.png"sv)), auto go_first_action = GUI::Action::create("&Go to First", { Mod_None, Key_Home }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-first.png"sv)),
[&](auto&) { [&](auto&) {
widget->navigate(ViewWidget::Directions::First); widget.navigate(ViewWidget::Directions::First);
}); });
auto go_back_action = GUI::Action::create("Go to &Previous", { Mod_None, Key_Left }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv)), auto go_back_action = GUI::Action::create("Go to &Previous", { Mod_None, Key_Left }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv)),
[&](auto&) { [&](auto&) {
widget->navigate(ViewWidget::Directions::Back); widget.navigate(ViewWidget::Directions::Back);
}); });
auto go_forward_action = GUI::Action::create("Go to &Next", { Mod_None, Key_Right }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), auto go_forward_action = GUI::Action::create("Go to &Next", { Mod_None, Key_Right }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)),
[&](auto&) { [&](auto&) {
widget->navigate(ViewWidget::Directions::Forward); widget.navigate(ViewWidget::Directions::Forward);
}); });
auto go_last_action = GUI::Action::create("Go to &Last", { Mod_None, Key_End }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-last.png"sv)), auto go_last_action = GUI::Action::create("Go to &Last", { Mod_None, Key_End }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-last.png"sv)),
[&](auto&) { [&](auto&) {
widget->navigate(ViewWidget::Directions::Last); widget.navigate(ViewWidget::Directions::Last);
}); });
auto full_screen_action = GUI::CommonActions::make_fullscreen_action( auto full_screen_action = GUI::CommonActions::make_fullscreen_action(
[&](auto&) { [&](auto&) {
widget->on_doubleclick(); widget.on_doubleclick();
}); });
auto zoom_in_action = GUI::CommonActions::make_zoom_in_action( auto zoom_in_action = GUI::CommonActions::make_zoom_in_action(
[&](auto&) { [&](auto&) {
widget->set_scale(widget->scale() * 1.44f); widget.set_scale(widget.scale() * 1.44f);
}, },
window); window);
auto reset_zoom_action = GUI::CommonActions::make_reset_zoom_action( auto reset_zoom_action = GUI::CommonActions::make_reset_zoom_action(
[&](auto&) { [&](auto&) {
widget->set_scale(1.f); widget.set_scale(1.f);
}, },
window); window);
auto fit_image_to_view_action = GUI::Action::create( auto fit_image_to_view_action = GUI::Action::create(
"Fit Image To &View", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fit-image-to-view.png"sv)), [&](auto&) { "Fit Image To &View", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fit-image-to-view.png"sv)), [&](auto&) {
widget->fit_content_to_view(); widget.fit_content_to_view();
}); });
auto zoom_out_action = GUI::CommonActions::make_zoom_out_action( auto zoom_out_action = GUI::CommonActions::make_zoom_out_action(
[&](auto&) { [&](auto&) {
widget->set_scale(widget->scale() / 1.44f); widget.set_scale(widget.scale() / 1.44f);
}, },
window); window);
auto hide_show_toolbar_action = GUI::Action::create_checkable("&Toolbar", { Mod_Ctrl, Key_T }, auto hide_show_toolbar_action = GUI::Action::create_checkable("&Toolbar", { Mod_Ctrl, Key_T },
[&](auto& action) { [&](auto& action) {
toolbar_container->set_visible(action.is_checked()); toolbar_container.set_visible(action.is_checked());
}); });
hide_show_toolbar_action->set_checked(true); hide_show_toolbar_action->set_checked(true);
auto copy_action = GUI::CommonActions::make_copy_action([&](auto&) { auto copy_action = GUI::CommonActions::make_copy_action([&](auto&) {
if (widget->image()) if (widget.image())
GUI::Clipboard::the().set_bitmap(*widget->image()->bitmap({}).release_value_but_fixme_should_propagate_errors()); GUI::Clipboard::the().set_bitmap(*widget.image()->bitmap({}).release_value_but_fixme_should_propagate_errors());
}); });
auto nearest_neighbor_action = GUI::Action::create_checkable("&Nearest Neighbor", [&](auto&) { auto nearest_neighbor_action = GUI::Action::create_checkable("&Nearest Neighbor", [&](auto&) {
widget->set_scaling_mode(Gfx::Painter::ScalingMode::NearestNeighbor); widget.set_scaling_mode(Gfx::Painter::ScalingMode::NearestNeighbor);
}); });
nearest_neighbor_action->set_checked(true); nearest_neighbor_action->set_checked(true);
auto smooth_pixels_action = GUI::Action::create_checkable("&Smooth Pixels", [&](auto&) { auto smooth_pixels_action = GUI::Action::create_checkable("&Smooth Pixels", [&](auto&) {
widget->set_scaling_mode(Gfx::Painter::ScalingMode::SmoothPixels); widget.set_scaling_mode(Gfx::Painter::ScalingMode::SmoothPixels);
}); });
auto bilinear_action = GUI::Action::create_checkable("&Bilinear", [&](auto&) { auto bilinear_action = GUI::Action::create_checkable("&Bilinear", [&](auto&) {
widget->set_scaling_mode(Gfx::Painter::ScalingMode::BilinearBlend); widget.set_scaling_mode(Gfx::Painter::ScalingMode::BilinearBlend);
}); });
auto box_sampling_action = GUI::Action::create_checkable("B&ox Sampling", [&](auto&) { auto box_sampling_action = GUI::Action::create_checkable("B&ox Sampling", [&](auto&) {
widget->set_scaling_mode(Gfx::Painter::ScalingMode::BoxSampling); widget.set_scaling_mode(Gfx::Painter::ScalingMode::BoxSampling);
}); });
widget->on_image_change = [&](Image const* image) { widget.on_image_change = [&](Image const* image) {
bool should_enable_image_actions = (image != nullptr); bool should_enable_image_actions = (image != nullptr);
bool should_enable_forward_actions = (widget->is_next_available() && should_enable_image_actions); bool should_enable_forward_actions = (widget.is_next_available() && should_enable_image_actions);
bool should_enable_backward_actions = (widget->is_previous_available() && should_enable_image_actions); bool should_enable_backward_actions = (widget.is_previous_available() && should_enable_image_actions);
delete_action->set_enabled(should_enable_image_actions); delete_action->set_enabled(should_enable_image_actions);
rotate_counterclockwise_action->set_enabled(should_enable_image_actions); rotate_counterclockwise_action->set_enabled(should_enable_image_actions);
rotate_clockwise_action->set_enabled(should_enable_image_actions); rotate_clockwise_action->set_enabled(should_enable_image_actions);
@ -294,17 +294,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
}; };
main_toolbar->add_action(open_action); main_toolbar.add_action(open_action);
main_toolbar->add_action(delete_action); main_toolbar.add_action(delete_action);
main_toolbar->add_separator(); main_toolbar.add_separator();
main_toolbar->add_action(go_first_action); main_toolbar.add_action(go_first_action);
main_toolbar->add_action(go_back_action); main_toolbar.add_action(go_back_action);
main_toolbar->add_action(go_forward_action); main_toolbar.add_action(go_forward_action);
main_toolbar->add_action(go_last_action); main_toolbar.add_action(go_last_action);
main_toolbar->add_separator(); main_toolbar.add_separator();
main_toolbar->add_action(zoom_in_action); main_toolbar.add_action(zoom_in_action);
main_toolbar->add_action(reset_zoom_action); main_toolbar.add_action(reset_zoom_action);
main_toolbar->add_action(zoom_out_action); main_toolbar.add_action(zoom_out_action);
auto file_menu = window->add_menu("&File"_string); auto file_menu = window->add_menu("&File"_string);
file_menu->add_action(open_action); file_menu->add_action(open_action);
@ -318,7 +318,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return; return;
auto value = result.release_value(); auto value = result.release_value();
widget->open_file(value.filename(), value.stream()); widget.open_file(value.filename(), value.stream());
}); });
file_menu->add_action(quit_action); file_menu->add_action(quit_action);
@ -380,9 +380,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return 1; return 1;
auto value = result.release_value(); auto value = result.release_value();
widget->open_file(value.filename(), value.stream()); widget.open_file(value.filename(), value.stream());
} else { } else {
widget->clear(); widget.clear();
} }
return app->exec(); return app->exec();

76
Userland/Applications/Maps/main.cpp
View file

@ -49,35 +49,35 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
root_widget->set_layout<GUI::VerticalBoxLayout>(GUI::Margins {}, 2); root_widget->set_layout<GUI::VerticalBoxLayout>(GUI::Margins {}, 2);
// Toolbar // Toolbar
auto toolbar_container = TRY(root_widget->try_add<GUI::ToolbarContainer>()); auto& toolbar_container = root_widget->add<GUI::ToolbarContainer>();
auto toolbar = TRY(toolbar_container->try_add<GUI::Toolbar>()); auto& toolbar = toolbar_container.add<GUI::Toolbar>();
// Main Widget // Main Widget
auto main_widget = TRY(root_widget->try_add<GUI::HorizontalSplitter>()); auto& main_widget = root_widget->add<GUI::HorizontalSplitter>();
// Map widget // Map widget
Maps::UsersMapWidget::Options options {}; Maps::UsersMapWidget::Options options {};
options.center.latitude = Config::read_string("Maps"sv, "MapView"sv, "CenterLatitude"sv, "30"sv).to_double().value_or(30.0); options.center.latitude = Config::read_string("Maps"sv, "MapView"sv, "CenterLatitude"sv, "30"sv).to_double().value_or(30.0);
options.center.longitude = Config::read_string("Maps"sv, "MapView"sv, "CenterLongitude"sv, "0"sv).to_double().value_or(0.0); options.center.longitude = Config::read_string("Maps"sv, "MapView"sv, "CenterLongitude"sv, "0"sv).to_double().value_or(0.0);
options.zoom = Config::read_i32("Maps"sv, "MapView"sv, "Zoom"sv, MAP_ZOOM_DEFAULT); options.zoom = Config::read_i32("Maps"sv, "MapView"sv, "Zoom"sv, MAP_ZOOM_DEFAULT);
auto map_widget = TRY(main_widget->try_add<Maps::UsersMapWidget>(options)); auto& map_widget = main_widget.add<Maps::UsersMapWidget>(options);
map_widget->set_frame_style(Gfx::FrameStyle::SunkenContainer); map_widget.set_frame_style(Gfx::FrameStyle::SunkenContainer);
map_widget->set_show_users(Config::read_bool("Maps"sv, "MapView"sv, "ShowUsers"sv, false)); map_widget.set_show_users(Config::read_bool("Maps"sv, "MapView"sv, "ShowUsers"sv, false));
// Search panel // Search panel
auto search_panel = TRY(Maps::SearchPanel::create()); auto search_panel = TRY(Maps::SearchPanel::create());
search_panel->on_places_change = [map_widget](auto) { map_widget->remove_markers_with_name("search"sv); }; search_panel->on_places_change = [&map_widget](auto) { map_widget.remove_markers_with_name("search"sv); };
search_panel->on_selected_place_change = [map_widget](auto const& place) { search_panel->on_selected_place_change = [&map_widget](auto const& place) {
// Remove old search markers // Remove old search markers
map_widget->remove_markers_with_name("search"sv); map_widget.remove_markers_with_name("search"sv);
// Add new marker and zoom into it // Add new marker and zoom into it
map_widget->add_marker({ place.latlng, place.name, {}, "search"_string }); map_widget.add_marker({ place.latlng, place.name, {}, "search"_string });
map_widget->set_center(place.latlng); map_widget.set_center(place.latlng);
map_widget->set_zoom(place.zoom); map_widget.set_zoom(place.zoom);
}; };
if (Config::read_bool("Maps"sv, "SearchPanel"sv, "Show"sv, false)) if (Config::read_bool("Maps"sv, "SearchPanel"sv, "Show"sv, false))
main_widget->insert_child_before(search_panel, map_widget); main_widget.insert_child_before(search_panel, map_widget);
// Main menu actions // Main menu actions
auto file_menu = window->add_menu("&File"_string); auto file_menu = window->add_menu("&File"_string);
@ -90,27 +90,27 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto view_menu = window->add_menu("&View"_string); auto view_menu = window->add_menu("&View"_string);
auto show_search_panel_action = GUI::Action::create_checkable( auto show_search_panel_action = GUI::Action::create_checkable(
"Show search panel", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv)), [main_widget, search_panel, map_widget](auto& action) { "Show search panel", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv)), [&main_widget, search_panel, &map_widget](auto& action) {
if (action.is_checked()) { if (action.is_checked()) {
main_widget->insert_child_before(search_panel, map_widget); main_widget.insert_child_before(search_panel, map_widget);
} else { } else {
map_widget->remove_markers_with_name("search"sv); map_widget.remove_markers_with_name("search"sv);
search_panel->reset(); search_panel->reset();
main_widget->remove_child(search_panel); main_widget.remove_child(search_panel);
} }
}, },
window); window);
show_search_panel_action->set_checked(Config::read_bool("Maps"sv, "SearchPanel"sv, "Show"sv, false)); show_search_panel_action->set_checked(Config::read_bool("Maps"sv, "SearchPanel"sv, "Show"sv, false));
auto show_users_action = GUI::Action::create_checkable( auto show_users_action = GUI::Action::create_checkable(
"Show SerenityOS users", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/ladyball.png"sv)), [map_widget](auto& action) { map_widget->set_show_users(action.is_checked()); }, window); "Show SerenityOS users", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/ladyball.png"sv)), [&map_widget](auto& action) { map_widget.set_show_users(action.is_checked()); }, window);
show_users_action->set_checked(map_widget->show_users()); show_users_action->set_checked(map_widget.show_users());
auto zoom_in_action = GUI::CommonActions::make_zoom_in_action([map_widget](auto&) { map_widget->set_zoom(map_widget->zoom() + 1); }, window); auto zoom_in_action = GUI::CommonActions::make_zoom_in_action([&map_widget](auto&) { map_widget.set_zoom(map_widget.zoom() + 1); }, window);
auto zoom_out_action = GUI::CommonActions::make_zoom_out_action([map_widget](auto&) { map_widget->set_zoom(map_widget->zoom() - 1); }, window); auto zoom_out_action = GUI::CommonActions::make_zoom_out_action([&map_widget](auto&) { map_widget.set_zoom(map_widget.zoom() - 1); }, window);
auto reset_zoom_action = GUI::CommonActions::make_reset_zoom_action([map_widget](auto&) { map_widget->set_zoom(MAP_ZOOM_DEFAULT); }, window); auto reset_zoom_action = GUI::CommonActions::make_reset_zoom_action([&map_widget](auto&) { map_widget.set_zoom(MAP_ZOOM_DEFAULT); }, window);
auto fullscreen_action = GUI::CommonActions::make_fullscreen_action([window, toolbar_container, map_widget](auto&) { auto fullscreen_action = GUI::CommonActions::make_fullscreen_action([window, &toolbar_container, &map_widget](auto&) {
window->set_fullscreen(!window->is_fullscreen()); window->set_fullscreen(!window->is_fullscreen());
toolbar_container->set_visible(!window->is_fullscreen()); toolbar_container.set_visible(!window->is_fullscreen());
map_widget->set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer); map_widget.set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer);
}, },
window); window);
view_menu->add_action(show_search_panel_action); view_menu->add_action(show_search_panel_action);
@ -128,24 +128,24 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
help_menu->add_action(GUI::CommonActions::make_about_action("Maps"_string, app_icon, window)); help_menu->add_action(GUI::CommonActions::make_about_action("Maps"_string, app_icon, window));
// Main toolbar actions // Main toolbar actions
toolbar->add_action(show_search_panel_action); toolbar.add_action(show_search_panel_action);
toolbar->add_separator(); toolbar.add_separator();
toolbar->add_action(show_users_action); toolbar.add_action(show_users_action);
toolbar->add_separator(); toolbar.add_separator();
toolbar->add_action(zoom_in_action); toolbar.add_action(zoom_in_action);
toolbar->add_action(zoom_out_action); toolbar.add_action(zoom_out_action);
toolbar->add_action(reset_zoom_action); toolbar.add_action(reset_zoom_action);
toolbar->add_separator(); toolbar.add_separator();
toolbar->add_action(open_settings_action); toolbar.add_action(open_settings_action);
window->show(); window->show();
// Remember last window state // Remember last window state
int exec = app->exec(); int exec = app->exec();
Config::write_bool("Maps"sv, "SearchPanel"sv, "Show"sv, show_search_panel_action->is_checked()); Config::write_bool("Maps"sv, "SearchPanel"sv, "Show"sv, show_search_panel_action->is_checked());
Config::write_string("Maps"sv, "MapView"sv, "CenterLatitude"sv, TRY(String::number(map_widget->center().latitude))); Config::write_string("Maps"sv, "MapView"sv, "CenterLatitude"sv, TRY(String::number(map_widget.center().latitude)));
Config::write_string("Maps"sv, "MapView"sv, "CenterLongitude"sv, TRY(String::number(map_widget->center().longitude))); Config::write_string("Maps"sv, "MapView"sv, "CenterLongitude"sv, TRY(String::number(map_widget.center().longitude)));
Config::write_i32("Maps"sv, "MapView"sv, "Zoom"sv, map_widget->zoom()); Config::write_i32("Maps"sv, "MapView"sv, "Zoom"sv, map_widget.zoom());
Config::write_bool("Maps"sv, "MapView"sv, "ShowUsers"sv, map_widget->show_users()); Config::write_bool("Maps"sv, "MapView"sv, "ShowUsers"sv, map_widget.show_users());
return exec; return exec;
} }

20
Userland/Applications/Piano/MainWidget.cpp
View file

@ -39,11 +39,11 @@ ErrorOr<void> MainWidget::initialize()
set_layout<GUI::VerticalBoxLayout>(2, 2); set_layout<GUI::VerticalBoxLayout>(2, 2);
set_fill_with_background_color(true); set_fill_with_background_color(true);
m_wave_widget = TRY(try_add<WaveWidget>(m_track_manager)); m_wave_widget = add<WaveWidget>(m_track_manager);
m_wave_widget->set_fixed_height(100); m_wave_widget->set_fixed_height(100);
TRY(m_wave_widget->set_sample_size(sample_count)); TRY(m_wave_widget->set_sample_size(sample_count));
m_tab_widget = TRY(try_add<GUI::TabWidget>()); m_tab_widget = add<GUI::TabWidget>();
m_roll_widget = m_tab_widget->add_tab<RollWidget>("Piano Roll"_string, m_track_manager); m_roll_widget = m_tab_widget->add_tab<RollWidget>("Piano Roll"_string, m_track_manager);
m_roll_widget->set_fixed_height(300); m_roll_widget->set_fixed_height(300);
@ -51,23 +51,23 @@ ErrorOr<void> MainWidget::initialize()
m_tab_widget->add_tab<SamplerWidget>("Sampler"_string, m_track_manager); m_tab_widget->add_tab<SamplerWidget>("Sampler"_string, m_track_manager);
m_player_widget = TRY(try_add<PlayerWidget>(m_track_manager, *this, m_audio_loop)); m_player_widget = TRY(try_add<PlayerWidget>(m_track_manager, *this, m_audio_loop));
m_keys_and_knobs_container = TRY(try_add<GUI::Widget>()); m_keys_and_knobs_container = add<GUI::Widget>();
m_keys_and_knobs_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 2); m_keys_and_knobs_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 2);
m_keys_and_knobs_container->set_fixed_height(130); m_keys_and_knobs_container->set_fixed_height(130);
m_keys_and_knobs_container->set_fill_with_background_color(true); m_keys_and_knobs_container->set_fill_with_background_color(true);
m_keys_widget = TRY(m_keys_and_knobs_container->try_add<KeysWidget>(m_track_manager.keyboard())); m_keys_widget = m_keys_and_knobs_container->add<KeysWidget>(m_track_manager.keyboard());
m_octave_container = TRY(m_keys_and_knobs_container->try_add<GUI::Widget>()); m_octave_container = m_keys_and_knobs_container->add<GUI::Widget>();
m_octave_container->set_preferred_width(GUI::SpecialDimension::Fit); m_octave_container->set_preferred_width(GUI::SpecialDimension::Fit);
m_octave_container->set_layout<GUI::VerticalBoxLayout>(); m_octave_container->set_layout<GUI::VerticalBoxLayout>();
auto octave_label = TRY(m_octave_container->try_add<GUI::Label>("Octave"_string)); auto& octave_label = m_octave_container->add<GUI::Label>("Octave"_string);
octave_label->set_preferred_width(GUI::SpecialDimension::Fit); octave_label.set_preferred_width(GUI::SpecialDimension::Fit);
m_octave_value = TRY(m_octave_container->try_add<GUI::Label>(TRY(String::number(m_track_manager.keyboard()->virtual_keyboard_octave())))); m_octave_value = m_octave_container->add<GUI::Label>(TRY(String::number(m_track_manager.keyboard()->virtual_keyboard_octave())));
m_octave_value->set_preferred_width(GUI::SpecialDimension::Fit); m_octave_value->set_preferred_width(GUI::SpecialDimension::Fit);
// FIXME: Implement vertical flipping in GUI::Slider, not here. // FIXME: Implement vertical flipping in GUI::Slider, not here.
m_octave_knob = TRY(m_octave_container->try_add<GUI::VerticalSlider>()); m_octave_knob = m_octave_container->add<GUI::VerticalSlider>();
m_octave_knob->set_preferred_width(GUI::SpecialDimension::Fit); m_octave_knob->set_preferred_width(GUI::SpecialDimension::Fit);
m_octave_knob->set_tooltip_deprecated("Z: octave down, X: octave up"); m_octave_knob->set_tooltip_deprecated("Z: octave down, X: octave up");
m_octave_knob->set_range(octave_min - 1, octave_max - 1); m_octave_knob->set_range(octave_min - 1, octave_max - 1);
@ -80,7 +80,7 @@ ErrorOr<void> MainWidget::initialize()
m_octave_value->set_text(String::number(new_octave).release_value_but_fixme_should_propagate_errors()); m_octave_value->set_text(String::number(new_octave).release_value_but_fixme_should_propagate_errors());
}; };
m_knobs_widget = TRY(m_keys_and_knobs_container->try_add<GUI::StackWidget>()); m_knobs_widget = m_keys_and_knobs_container->add<GUI::StackWidget>();
for (auto track : m_track_manager.tracks()) for (auto track : m_track_manager.tracks())
TRY(m_track_controls.try_append(TRY(m_knobs_widget->try_add<TrackControlsWidget>(TRY(track->try_make_weak_ptr()))))); TRY(m_track_controls.try_append(TRY(m_knobs_widget->try_add<TrackControlsWidget>(TRY(track->try_make_weak_ptr())))));

14
Userland/Applications/Piano/PlayerWidget.cpp
View file

@ -45,10 +45,10 @@ ErrorOr<void> PlayerWidget::initialize()
set_fill_with_background_color(true); set_fill_with_background_color(true);
TRY(m_track_number_choices.try_append("1")); TRY(m_track_number_choices.try_append("1"));
RefPtr<GUI::Label> label = TRY(try_add<GUI::Label>("Track"_string)); RefPtr<GUI::Label> label = add<GUI::Label>("Track"_string);
label->set_max_width(75); label->set_max_width(75);
m_track_dropdown = TRY(try_add<GUI::ComboBox>()); m_track_dropdown = add<GUI::ComboBox>();
m_track_dropdown->set_max_width(75); m_track_dropdown->set_max_width(75);
m_track_dropdown->set_model(*GUI::ItemListModel<DeprecatedString>::create(m_track_number_choices)); m_track_dropdown->set_model(*GUI::ItemListModel<DeprecatedString>::create(m_track_number_choices));
m_track_dropdown->set_only_allow_values_from_model(true); m_track_dropdown->set_only_allow_values_from_model(true);
@ -59,7 +59,7 @@ ErrorOr<void> PlayerWidget::initialize()
m_main_widget.update_selected_track(); m_main_widget.update_selected_track();
}; };
m_add_track_button = TRY(try_add<GUI::Button>()); m_add_track_button = add<GUI::Button>();
m_add_track_button->set_icon(*m_add_track_icon); m_add_track_button->set_icon(*m_add_track_icon);
m_add_track_button->set_fixed_width(30); m_add_track_button->set_fixed_width(30);
m_add_track_button->set_tooltip_deprecated("Add Track"); m_add_track_button->set_tooltip_deprecated("Add Track");
@ -68,7 +68,7 @@ ErrorOr<void> PlayerWidget::initialize()
add_track(); add_track();
}; };
m_next_track_button = TRY(try_add<GUI::Button>()); m_next_track_button = add<GUI::Button>();
m_next_track_button->set_icon(*m_next_track_icon); m_next_track_button->set_icon(*m_next_track_icon);
m_next_track_button->set_fixed_width(30); m_next_track_button->set_fixed_width(30);
m_next_track_button->set_tooltip_deprecated("Next Track"); m_next_track_button->set_tooltip_deprecated("Next Track");
@ -77,7 +77,7 @@ ErrorOr<void> PlayerWidget::initialize()
next_track(); next_track();
}; };
m_play_button = TRY(try_add<GUI::Button>()); m_play_button = add<GUI::Button>();
m_play_button->set_icon(*m_pause_icon); m_play_button->set_icon(*m_pause_icon);
m_play_button->set_fixed_width(30); m_play_button->set_fixed_width(30);
m_play_button->set_tooltip_deprecated("Play/Pause playback"); m_play_button->set_tooltip_deprecated("Play/Pause playback");
@ -92,7 +92,7 @@ ErrorOr<void> PlayerWidget::initialize()
} }
}; };
m_back_button = TRY(try_add<GUI::Button>()); m_back_button = add<GUI::Button>();
m_back_button->set_icon(*m_back_icon); m_back_button->set_icon(*m_back_icon);
m_back_button->set_fixed_width(30); m_back_button->set_fixed_width(30);
m_back_button->set_tooltip_deprecated("Previous Note"); m_back_button->set_tooltip_deprecated("Previous Note");
@ -101,7 +101,7 @@ ErrorOr<void> PlayerWidget::initialize()
m_track_manager.time_forward(-(sample_rate / (beats_per_minute / 60) / notes_per_beat)); m_track_manager.time_forward(-(sample_rate / (beats_per_minute / 60) / notes_per_beat));
}; };
m_next_button = TRY(try_add<GUI::Button>()); m_next_button = add<GUI::Button>();
m_next_button->set_icon(*m_next_icon); m_next_button->set_icon(*m_next_icon);
m_next_button->set_fixed_width(30); m_next_button->set_fixed_width(30);
m_next_button->set_tooltip_deprecated("Next Note"); m_next_button->set_tooltip_deprecated("Next Note");

12
Userland/Applications/Piano/TrackControlsWidget.cpp
View file

@ -26,24 +26,24 @@ ErrorOr<NonnullRefPtr<TrackControlsWidget>> TrackControlsWidget::try_create(Weak
widget->set_preferred_width(GUI::SpecialDimension::Grow); widget->set_preferred_width(GUI::SpecialDimension::Grow);
widget->set_fill_with_background_color(true); widget->set_fill_with_background_color(true);
auto mastering_parameters = TRY(widget->try_add<GUI::GroupBox>()); auto& mastering_parameters = widget->add<GUI::GroupBox>();
mastering_parameters->set_layout<GUI::HorizontalBoxLayout>(); mastering_parameters.set_layout<GUI::HorizontalBoxLayout>();
auto strong_track = widget->m_track.value(); auto strong_track = widget->m_track.value();
for (auto& parameter : strong_track->track_mastering()->parameters()) for (auto& parameter : strong_track->track_mastering()->parameters())
(void)TRY(mastering_parameters->try_add<ProcessorParameterWidget>(parameter)); mastering_parameters.add<ProcessorParameterWidget>(parameter);
TRY(widget->m_processor_groups.try_append(mastering_parameters)); TRY(widget->m_processor_groups.try_append(mastering_parameters));
widget->add_spacer(); widget->add_spacer();
for (auto& processor : strong_track->processor_chain()) { for (auto& processor : strong_track->processor_chain()) {
auto processor_parameters = TRY(widget->try_add<GUI::GroupBox>()); auto& processor_parameters = widget->add<GUI::GroupBox>();
processor_parameters->set_layout<GUI::HorizontalBoxLayout>(); processor_parameters.set_layout<GUI::HorizontalBoxLayout>();
for (auto& parameter : processor->parameters()) for (auto& parameter : processor->parameters())
(void)TRY(processor_parameters->try_add<ProcessorParameterWidget>(parameter)); processor_parameters.add<ProcessorParameterWidget>(parameter);
TRY(widget->m_processor_groups.try_append(processor_parameters)); TRY(widget->m_processor_groups.try_append(processor_parameters));
} }

48
Userland/Applications/PixelPaint/Filters/Bloom.cpp
View file

@ -40,39 +40,39 @@ ErrorOr<RefPtr<GUI::Widget>> Bloom::get_settings_widget()
auto settings_widget = GUI::Widget::construct(); auto settings_widget = GUI::Widget::construct();
settings_widget->set_layout<GUI::VerticalBoxLayout>(); settings_widget->set_layout<GUI::VerticalBoxLayout>();
auto name_label = TRY(settings_widget->try_add<GUI::Label>("Bloom Filter"_string)); auto& name_label = settings_widget->add<GUI::Label>("Bloom Filter"_string);
name_label->set_font_weight(Gfx::FontWeight::Bold); name_label.set_font_weight(Gfx::FontWeight::Bold);
name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label->set_fixed_height(20); name_label.set_fixed_height(20);
auto luma_lower_container = TRY(settings_widget->try_add<GUI::Widget>()); auto& luma_lower_container = settings_widget->add<GUI::Widget>();
luma_lower_container->set_fixed_height(50); luma_lower_container.set_fixed_height(50);
luma_lower_container->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }); luma_lower_container.set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 });
auto luma_lower_label = TRY(luma_lower_container->try_add<GUI::Label>("Luma lower bound:"_string)); auto& luma_lower_label = luma_lower_container.add<GUI::Label>("Luma lower bound:"_string);
luma_lower_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); luma_lower_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
luma_lower_label->set_fixed_height(20); luma_lower_label.set_fixed_height(20);
auto luma_lower_slider = TRY(luma_lower_container->try_add<GUI::ValueSlider>(Orientation::Horizontal)); auto& luma_lower_slider = luma_lower_container.add<GUI::ValueSlider>(Orientation::Horizontal);
luma_lower_slider->set_range(0, 255); luma_lower_slider.set_range(0, 255);
luma_lower_slider->set_value(m_luma_lower); luma_lower_slider.set_value(m_luma_lower);
luma_lower_slider->on_change = [&](int value) { luma_lower_slider.on_change = [&](int value) {
m_luma_lower = value; m_luma_lower = value;
update_preview(); update_preview();
}; };
auto radius_container = TRY(settings_widget->try_add<GUI::Widget>()); auto& radius_container = settings_widget->add<GUI::Widget>();
radius_container->set_fixed_height(50); radius_container.set_fixed_height(50);
radius_container->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }); radius_container.set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 });
auto radius_label = TRY(radius_container->try_add<GUI::Label>("Blur Radius:"_string)); auto& radius_label = radius_container.add<GUI::Label>("Blur Radius:"_string);
radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
radius_label->set_fixed_height(20); radius_label.set_fixed_height(20);
auto radius_slider = TRY(radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& radius_slider = radius_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
radius_slider->set_range(0, 50); radius_slider.set_range(0, 50);
radius_slider->set_value(m_blur_radius); radius_slider.set_value(m_blur_radius);
radius_slider->on_change = [&](int value) { radius_slider.on_change = [&](int value) {
m_blur_radius = value; m_blur_radius = value;
update_preview(); update_preview();
}; };

102
Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp
View file

@ -42,15 +42,15 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
auto settings_widget = GUI::Widget::construct(); auto settings_widget = GUI::Widget::construct();
settings_widget->set_layout<GUI::VerticalBoxLayout>(); settings_widget->set_layout<GUI::VerticalBoxLayout>();
auto name_label = TRY(settings_widget->try_add<GUI::Label>("Fast Box Blur Filter"_string)); auto& name_label = settings_widget->add<GUI::Label>("Fast Box Blur Filter"_string);
name_label->set_font_weight(Gfx::FontWeight::Bold); name_label.set_font_weight(Gfx::FontWeight::Bold);
name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label->set_fixed_height(10); name_label.set_fixed_height(10);
auto asymmetric_checkbox = TRY(settings_widget->try_add<GUI::CheckBox>("Use Asymmetric Radii"_string)); auto& asymmetric_checkbox = settings_widget->add<GUI::CheckBox>("Use Asymmetric Radii"_string);
asymmetric_checkbox->set_checked(false); asymmetric_checkbox.set_checked(false);
asymmetric_checkbox->set_fixed_height(15); asymmetric_checkbox.set_fixed_height(15);
asymmetric_checkbox->on_checked = [this](bool checked) { asymmetric_checkbox.on_checked = [this](bool checked) {
m_use_asymmetric_radii = checked; m_use_asymmetric_radii = checked;
if (m_use_asymmetric_radii) { if (m_use_asymmetric_radii) {
m_vector_checkbox->set_visible(true); m_vector_checkbox->set_visible(true);
@ -68,7 +68,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
update_preview(); update_preview();
}; };
m_vector_checkbox = TRY(settings_widget->try_add<GUI::CheckBox>("Use Direction and magnitude"_string)); m_vector_checkbox = settings_widget->add<GUI::CheckBox>("Use Direction and magnitude"_string);
m_vector_checkbox->set_checked(false); m_vector_checkbox->set_checked(false);
m_vector_checkbox->set_visible(false); m_vector_checkbox->set_visible(false);
m_vector_checkbox->set_fixed_height(15); m_vector_checkbox->set_fixed_height(15);
@ -84,36 +84,36 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
update_preview(); update_preview();
}; };
m_radius_container = TRY(settings_widget->try_add<GUI::Widget>()); m_radius_container = settings_widget->add<GUI::Widget>();
m_radius_container->set_fixed_height(20); m_radius_container->set_fixed_height(20);
m_radius_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }); m_radius_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 });
auto radius_label = TRY(m_radius_container->try_add<GUI::Label>("Radius:"_string)); auto& radius_label = m_radius_container->add<GUI::Label>("Radius:"_string);
radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
radius_label->set_fixed_size(50, 20); radius_label.set_fixed_size(50, 20);
auto radius_slider = TRY(m_radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& radius_slider = m_radius_container->add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
radius_slider->set_range(0, 25); radius_slider.set_range(0, 25);
radius_slider->set_value(m_radius); radius_slider.set_value(m_radius);
radius_slider->on_change = [&](int value) { radius_slider.on_change = [&](int value) {
m_radius = value; m_radius = value;
update_preview(); update_preview();
}; };
m_asymmetric_radius_container = TRY(settings_widget->try_add<GUI::Widget>()); m_asymmetric_radius_container = settings_widget->add<GUI::Widget>();
m_asymmetric_radius_container->set_visible(false); m_asymmetric_radius_container->set_visible(false);
m_asymmetric_radius_container->set_fixed_height(50); m_asymmetric_radius_container->set_fixed_height(50);
m_asymmetric_radius_container->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }); m_asymmetric_radius_container->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 });
auto radius_x_container = TRY(m_asymmetric_radius_container->try_add<GUI::Widget>()); auto& radius_x_container = m_asymmetric_radius_container->add<GUI::Widget>();
radius_x_container->set_fixed_height(20); radius_x_container.set_fixed_height(20);
radius_x_container->set_layout<GUI::HorizontalBoxLayout>(); radius_x_container.set_layout<GUI::HorizontalBoxLayout>();
auto radius_x_label = TRY(radius_x_container->try_add<GUI::Label>("Radius X:"_string)); auto& radius_x_label = radius_x_container.add<GUI::Label>("Radius X:"_string);
radius_x_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_x_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
radius_x_label->set_fixed_size(50, 20); radius_x_label.set_fixed_size(50, 20);
m_radius_x_slider = TRY(radius_x_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); m_radius_x_slider = radius_x_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
m_radius_x_slider->set_range(0, 50); m_radius_x_slider->set_range(0, 50);
m_radius_x_slider->set_value(m_radius_x); m_radius_x_slider->set_value(m_radius_x);
m_radius_x_slider->on_change = [&](int value) { m_radius_x_slider->on_change = [&](int value) {
@ -121,15 +121,15 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
update_preview(); update_preview();
}; };
auto radius_y_container = TRY(m_asymmetric_radius_container->try_add<GUI::Widget>()); auto& radius_y_container = m_asymmetric_radius_container->add<GUI::Widget>();
radius_y_container->set_fixed_height(20); radius_y_container.set_fixed_height(20);
radius_y_container->set_layout<GUI::HorizontalBoxLayout>(); radius_y_container.set_layout<GUI::HorizontalBoxLayout>();
auto radius_y_label = TRY(radius_y_container->try_add<GUI::Label>("Radius Y:"_string)); auto& radius_y_label = radius_y_container.add<GUI::Label>("Radius Y:"_string);
radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_y_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
radius_y_label->set_fixed_size(50, 20); radius_y_label.set_fixed_size(50, 20);
m_radius_y_slider = TRY(radius_y_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); m_radius_y_slider = radius_y_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
m_radius_y_slider->set_range(0, 50); m_radius_y_slider->set_range(0, 50);
m_radius_y_slider->set_value(m_radius_y); m_radius_y_slider->set_value(m_radius_y);
m_radius_y_slider->on_change = [&](int value) { m_radius_y_slider->on_change = [&](int value) {
@ -137,20 +137,20 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
update_preview(); update_preview();
}; };
m_vector_container = TRY(settings_widget->try_add<GUI::Widget>()); m_vector_container = settings_widget->add<GUI::Widget>();
m_vector_container->set_visible(false); m_vector_container->set_visible(false);
m_vector_container->set_fixed_height(50); m_vector_container->set_fixed_height(50);
m_vector_container->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }); m_vector_container->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 });
auto angle_container = TRY(m_vector_container->try_add<GUI::Widget>()); auto& angle_container = m_vector_container->add<GUI::Widget>();
angle_container->set_fixed_height(20); angle_container.set_fixed_height(20);
angle_container->set_layout<GUI::HorizontalBoxLayout>(); angle_container.set_layout<GUI::HorizontalBoxLayout>();
auto angle_label = TRY(angle_container->try_add<GUI::Label>("Angle:"_string)); auto& angle_label = angle_container.add<GUI::Label>("Angle:"_string);
angle_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); angle_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
angle_label->set_fixed_size(60, 20); angle_label.set_fixed_size(60, 20);
m_angle_slider = TRY(angle_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "°"_string)); m_angle_slider = angle_container.add<GUI::ValueSlider>(Orientation::Horizontal, "°"_string);
m_angle_slider->set_range(0, 360); m_angle_slider->set_range(0, 360);
m_angle_slider->set_value(m_angle); m_angle_slider->set_value(m_angle);
m_angle_slider->on_change = [&](int value) { m_angle_slider->on_change = [&](int value) {
@ -158,15 +158,15 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
update_preview(); update_preview();
}; };
auto magnitude_container = TRY(m_vector_container->try_add<GUI::Widget>()); auto& magnitude_container = m_vector_container->add<GUI::Widget>();
magnitude_container->set_fixed_height(20); magnitude_container.set_fixed_height(20);
magnitude_container->set_layout<GUI::HorizontalBoxLayout>(); magnitude_container.set_layout<GUI::HorizontalBoxLayout>();
auto magnitude_label = TRY(magnitude_container->try_add<GUI::Label>("Magnitude:"_string)); auto& magnitude_label = magnitude_container.add<GUI::Label>("Magnitude:"_string);
magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); magnitude_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
magnitude_label->set_fixed_size(60, 20); magnitude_label.set_fixed_size(60, 20);
m_magnitude_slider = TRY(magnitude_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); m_magnitude_slider = magnitude_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
m_magnitude_slider->set_range(0, 50); m_magnitude_slider->set_range(0, 50);
m_magnitude_slider->set_value(m_radius); m_magnitude_slider->set_value(m_radius);
m_magnitude_slider->on_change = [&](int value) { m_magnitude_slider->on_change = [&](int value) {
@ -174,11 +174,11 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
update_preview(); update_preview();
}; };
auto gaussian_container = TRY(settings_widget->try_add<GUI::Widget>()); auto& gaussian_container = settings_widget->add<GUI::Widget>();
gaussian_container->set_fixed_height(20); gaussian_container.set_fixed_height(20);
gaussian_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }); gaussian_container.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 });
m_gaussian_checkbox = TRY(gaussian_container->try_add<GUI::CheckBox>("Approximate Gaussian Blur"_string)); m_gaussian_checkbox = gaussian_container.add<GUI::CheckBox>("Approximate Gaussian Blur"_string);
m_gaussian_checkbox->set_checked(m_approximate_gauss); m_gaussian_checkbox->set_checked(m_approximate_gauss);
m_gaussian_checkbox->set_tooltip_deprecated("A real gaussian blur can be approximated by running the box blur multiple times with different weights."); m_gaussian_checkbox->set_tooltip_deprecated("A real gaussian blur can be approximated by running the box blur multiple times with different weights.");
m_gaussian_checkbox->on_checked = [this](bool checked) { m_gaussian_checkbox->on_checked = [this](bool checked) {

6
Userland/Applications/PixelPaint/Filters/Filter.cpp
View file

@ -28,10 +28,10 @@ ErrorOr<RefPtr<GUI::Widget>> Filter::get_settings_widget()
auto settings_widget = GUI::Widget::construct(); auto settings_widget = GUI::Widget::construct();
settings_widget->set_layout<GUI::VerticalBoxLayout>(); settings_widget->set_layout<GUI::VerticalBoxLayout>();
auto name_label = TRY(settings_widget->try_add<GUI::Label>(TRY(String::from_utf8(filter_name())))); auto& name_label = settings_widget->add<GUI::Label>(TRY(String::from_utf8(filter_name())));
name_label->set_text_alignment(Gfx::TextAlignment::TopLeft); name_label.set_text_alignment(Gfx::TextAlignment::TopLeft);
(void)TRY(settings_widget->try_add<GUI::Widget>()); settings_widget->add<GUI::Widget>();
m_settings_widget = settings_widget; m_settings_widget = settings_widget;
} }

16
Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp
View file

@ -34,15 +34,15 @@ ErrorOr<RefPtr<GUI::Widget>> HueAndSaturation::get_settings_widget()
settings_widget->set_layout<GUI::VerticalBoxLayout>(); settings_widget->set_layout<GUI::VerticalBoxLayout>();
auto add_slider = [&](auto name, int min, int max, auto member) -> ErrorOr<void> { auto add_slider = [&](auto name, int min, int max, auto member) -> ErrorOr<void> {
auto name_label = TRY(settings_widget->try_add<GUI::Label>(TRY(String::from_utf8(name)))); auto& name_label = settings_widget->add<GUI::Label>(TRY(String::from_utf8(name)));
name_label->set_font_weight(Gfx::FontWeight::Bold); name_label.set_font_weight(Gfx::FontWeight::Bold);
name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label->set_fixed_height(20); name_label.set_fixed_height(20);
auto slider = TRY(settings_widget->try_add<GUI::ValueSlider>(Orientation::Horizontal)); auto& slider = settings_widget->add<GUI::ValueSlider>(Orientation::Horizontal);
slider->set_range(min, max); slider.set_range(min, max);
slider->set_value(m_hue); slider.set_value(m_hue);
slider->on_change = [this, member](int value) { slider.on_change = [this, member](int value) {
this->*member = value; this->*member = value;
update_preview(); update_preview();
}; };

28
Userland/Applications/PixelPaint/Filters/Sepia.cpp
View file

@ -23,23 +23,23 @@ ErrorOr<RefPtr<GUI::Widget>> Sepia::get_settings_widget()
auto settings_widget = GUI::Widget::construct(); auto settings_widget = GUI::Widget::construct();
settings_widget->set_layout<GUI::VerticalBoxLayout>(); settings_widget->set_layout<GUI::VerticalBoxLayout>();
auto name_label = TRY(settings_widget->try_add<GUI::Label>("Sepia Filter"_string)); auto& name_label = settings_widget->add<GUI::Label>("Sepia Filter"_string);
name_label->set_font_weight(Gfx::FontWeight::Bold); name_label.set_font_weight(Gfx::FontWeight::Bold);
name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label->set_fixed_height(20); name_label.set_fixed_height(20);
auto amount_container = TRY(settings_widget->try_add<GUI::Widget>()); auto& amount_container = settings_widget->add<GUI::Widget>();
amount_container->set_fixed_height(20); amount_container.set_fixed_height(20);
amount_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }); amount_container.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 });
auto amount_label = TRY(amount_container->try_add<GUI::Label>("Amount:"_string)); auto& amount_label = amount_container.add<GUI::Label>("Amount:"_string);
amount_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); amount_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
amount_label->set_fixed_size(50, 20); amount_label.set_fixed_size(50, 20);
auto amount_slider = TRY(amount_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& amount_slider = amount_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
amount_slider->set_range(0, 100); amount_slider.set_range(0, 100);
amount_slider->set_value(m_amount * 100); amount_slider.set_value(m_amount * 100);
amount_slider->on_change = [this](int value) { amount_slider.on_change = [this](int value) {
m_amount = value * 0.01f; m_amount = value * 0.01f;
update_preview(); update_preview();
}; };

2
Userland/Applications/PixelPaint/MainWidget.cpp
View file

@ -1190,7 +1190,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
toolbar.add_action(*m_zoom_out_action); toolbar.add_action(*m_zoom_out_action);
toolbar.add_action(*m_reset_zoom_action); toolbar.add_action(*m_reset_zoom_action);
m_zoom_combobox = TRY(toolbar.try_add<GUI::ComboBox>()); m_zoom_combobox = toolbar.add<GUI::ComboBox>();
m_zoom_combobox->set_max_width(75); m_zoom_combobox->set_max_width(75);
m_zoom_combobox->set_model(*GUI::ItemListModel<DeprecatedString>::create(s_suggested_zoom_levels)); m_zoom_combobox->set_model(*GUI::ItemListModel<DeprecatedString>::create(s_suggested_zoom_levels));
m_zoom_combobox->on_change = [this](DeprecatedString const& value, GUI::ModelIndex const& index) { m_zoom_combobox->on_change = [this](DeprecatedString const& value, GUI::ModelIndex const& index) {

120
Userland/Applications/PixelPaint/Tools/BrushTool.cpp
View file

@ -203,12 +203,12 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(20); mode_container.set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string)); auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(60, 20); mode_label.set_fixed_size(60, 20);
static constexpr auto s_mode_names = [] { static constexpr auto s_mode_names = [] {
Array<StringView, (int)BrushMode::__Count> names; Array<StringView, (int)BrushMode::__Count> names;
@ -233,18 +233,18 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
return names; return names;
}(); }();
auto mode_combobox = TRY(mode_container->try_add<GUI::ComboBox>()); auto& mode_combobox = mode_container.add<GUI::ComboBox>();
mode_combobox->set_only_allow_values_from_model(true); mode_combobox.set_only_allow_values_from_model(true);
mode_combobox->set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names)); mode_combobox.set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names));
mode_combobox->set_selected_index((int)m_mode, GUI::AllowCallback::No); mode_combobox.set_selected_index((int)m_mode, GUI::AllowCallback::No);
auto priority_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& priority_container = properties_widget->add<GUI::Widget>();
priority_container->set_fixed_height(20); priority_container.set_fixed_height(20);
priority_container->set_visible(false); priority_container.set_visible(false);
priority_container->set_layout<GUI::HorizontalBoxLayout>(); priority_container.set_layout<GUI::HorizontalBoxLayout>();
auto priority_label = TRY(priority_container->try_add<GUI::Label>("Priority:"_string)); auto& priority_label = priority_container.add<GUI::Label>("Priority:"_string);
priority_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); priority_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
priority_label->set_fixed_size(60, 20); priority_label.set_fixed_size(60, 20);
static constexpr auto s_priority_names = [] { static constexpr auto s_priority_names = [] {
Array<StringView, (int)PriorityMode::__Count> names; Array<StringView, (int)PriorityMode::__Count> names;
@ -266,37 +266,37 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
return names; return names;
}(); }();
auto priority_combobox = TRY(priority_container->try_add<GUI::ComboBox>()); auto& priority_combobox = priority_container.add<GUI::ComboBox>();
priority_combobox->set_only_allow_values_from_model(true); priority_combobox.set_only_allow_values_from_model(true);
priority_combobox->set_model(*GUI::ItemListModel<StringView, decltype(s_priority_names)>::create(s_priority_names)); priority_combobox.set_model(*GUI::ItemListModel<StringView, decltype(s_priority_names)>::create(s_priority_names));
priority_combobox->set_selected_index((int)m_priority, GUI::AllowCallback::No); priority_combobox.set_selected_index((int)m_priority, GUI::AllowCallback::No);
auto exposure_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& exposure_container = properties_widget->add<GUI::Widget>();
exposure_container->set_fixed_height(20); exposure_container.set_fixed_height(20);
exposure_container->set_visible(false); exposure_container.set_visible(false);
exposure_container->set_layout<GUI::HorizontalBoxLayout>(); exposure_container.set_layout<GUI::HorizontalBoxLayout>();
auto exposure_label = TRY(exposure_container->try_add<GUI::Label>("Exposure:"_string)); auto& exposure_label = exposure_container.add<GUI::Label>("Exposure:"_string);
exposure_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); exposure_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
exposure_label->set_fixed_size(60, 20); exposure_label.set_fixed_size(60, 20);
auto exposure_slider = TRY(exposure_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& exposure_slider = exposure_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
exposure_slider->set_range(1, 100); exposure_slider.set_range(1, 100);
exposure_slider->set_value(m_exposure * 100); exposure_slider.set_value(m_exposure * 100);
mode_combobox->on_change = [this, priority_container, exposure_container](auto&, auto& model_index) { mode_combobox.on_change = [this, &priority_container, &exposure_container](auto&, auto& model_index) {
VERIFY(model_index.row() >= 0); VERIFY(model_index.row() >= 0);
VERIFY(model_index.row() < (int)BrushMode::__Count); VERIFY(model_index.row() < (int)BrushMode::__Count);
m_mode = (BrushMode)model_index.row(); m_mode = (BrushMode)model_index.row();
priority_container->set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn); priority_container.set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn);
exposure_container->set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn); exposure_container.set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn);
if (m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn) if (m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn)
update_precomputed_color_values(); update_precomputed_color_values();
}; };
priority_combobox->on_change = [this](auto&, auto& model_index) { priority_combobox.on_change = [this](auto&, auto& model_index) {
VERIFY(model_index.row() >= 0); VERIFY(model_index.row() >= 0);
VERIFY(model_index.row() < (int)PriorityMode::__Count); VERIFY(model_index.row() < (int)PriorityMode::__Count);
@ -304,47 +304,47 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
update_precomputed_color_values(); update_precomputed_color_values();
}; };
exposure_slider->on_change = [this](int value) { exposure_slider.on_change = [this](int value) {
m_exposure = value / 100.0f; m_exposure = value / 100.0f;
update_precomputed_color_values(); update_precomputed_color_values();
}; };
auto size_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& size_container = properties_widget->add<GUI::Widget>();
size_container->set_fixed_height(20); size_container.set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>(); size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string)); auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(60, 20); size_label.set_fixed_size(60, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider->set_range(1, 250); size_slider.set_range(1, 250);
size_slider->set_value(m_size); size_slider.set_value(m_size);
size_slider->set_override_cursor(cursor()); size_slider.set_override_cursor(cursor());
size_slider->on_change = [this, size_slider](int value) { size_slider.on_change = [this, &size_slider](int value) {
set_size(value); set_size(value);
// Update cursor to provide an instant preview for the selected size. // Update cursor to provide an instant preview for the selected size.
size_slider->set_override_cursor(cursor()); size_slider.set_override_cursor(cursor());
}; };
set_primary_slider(size_slider); set_primary_slider(&size_slider);
auto hardness_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container->set_fixed_height(20); hardness_container.set_fixed_height(20);
hardness_container->set_layout<GUI::HorizontalBoxLayout>(); hardness_container.set_layout<GUI::HorizontalBoxLayout>();
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string)); auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(60, 20); hardness_label.set_fixed_size(60, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider->set_range(1, 100); hardness_slider.set_range(1, 100);
hardness_slider->set_value(m_hardness); hardness_slider.set_value(m_hardness);
hardness_slider->on_change = [this](int value) { hardness_slider.on_change = [this](int value) {
set_hardness(value); set_hardness(value);
}; };
set_secondary_slider(hardness_slider); set_secondary_slider(&hardness_slider);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

22
Userland/Applications/PixelPaint/Tools/BucketTool.cpp
View file

@ -67,22 +67,22 @@ ErrorOr<GUI::Widget*> BucketTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto threshold_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& threshold_container = properties_widget->add<GUI::Widget>();
threshold_container->set_fixed_height(20); threshold_container.set_fixed_height(20);
threshold_container->set_layout<GUI::HorizontalBoxLayout>(); threshold_container.set_layout<GUI::HorizontalBoxLayout>();
auto threshold_label = TRY(threshold_container->try_add<GUI::Label>("Threshold:"_string)); auto& threshold_label = threshold_container.add<GUI::Label>("Threshold:"_string);
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); threshold_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label->set_fixed_size(80, 20); threshold_label.set_fixed_size(80, 20);
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& threshold_slider = threshold_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
threshold_slider->set_range(0, 100); threshold_slider.set_range(0, 100);
threshold_slider->set_value(m_threshold); threshold_slider.set_value(m_threshold);
threshold_slider->on_change = [this](int value) { threshold_slider.on_change = [this](int value) {
m_threshold = value; m_threshold = value;
}; };
set_primary_slider(threshold_slider); set_primary_slider(&threshold_slider);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

44
Userland/Applications/PixelPaint/Tools/CloneTool.cpp
View file

@ -131,40 +131,40 @@ ErrorOr<GUI::Widget*> CloneTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& size_container = properties_widget->add<GUI::Widget>();
size_container->set_fixed_height(20); size_container.set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>(); size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string)); auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20); size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider->set_range(1, 100); size_slider.set_range(1, 100);
size_slider->set_value(size()); size_slider.set_value(size());
size_slider->on_change = [this](int value) { size_slider.on_change = [this](int value) {
auto old_sample_marker_rect = sample_marker_rect(); auto old_sample_marker_rect = sample_marker_rect();
set_size(value); set_size(value);
update_sample_marker(old_sample_marker_rect); update_sample_marker(old_sample_marker_rect);
}; };
set_primary_slider(size_slider); set_primary_slider(&size_slider);
auto hardness_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container->set_fixed_height(20); hardness_container.set_fixed_height(20);
hardness_container->set_layout<GUI::HorizontalBoxLayout>(); hardness_container.set_layout<GUI::HorizontalBoxLayout>();
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string)); auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20); hardness_label.set_fixed_size(80, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider->set_range(1, 100); hardness_slider.set_range(1, 100);
hardness_slider->on_change = [&](int value) { hardness_slider.on_change = [&](int value) {
set_hardness(value); set_hardness(value);
}; };
hardness_slider->set_value(100); hardness_slider.set_value(100);
set_secondary_slider(hardness_slider); set_secondary_slider(&hardness_slider);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

74
Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
View file

@ -132,59 +132,59 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto thickness_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& thickness_container = properties_widget->add<GUI::Widget>();
thickness_container->set_fixed_height(20); thickness_container.set_fixed_height(20);
thickness_container->set_layout<GUI::HorizontalBoxLayout>(); thickness_container.set_layout<GUI::HorizontalBoxLayout>();
auto thickness_label = TRY(thickness_container->try_add<GUI::Label>("Thickness:"_string)); auto& thickness_label = thickness_container.add<GUI::Label>("Thickness:"_string);
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label->set_fixed_size(80, 20); thickness_label.set_fixed_size(80, 20);
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& thickness_slider = thickness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
thickness_slider->set_range(1, 10); thickness_slider.set_range(1, 10);
thickness_slider->set_value(m_thickness); thickness_slider.set_value(m_thickness);
thickness_slider->on_change = [this](int value) { thickness_slider.on_change = [this](int value) {
m_thickness = value; m_thickness = value;
}; };
set_primary_slider(thickness_slider); set_primary_slider(&thickness_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(70); mode_container.set_fixed_height(70);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string)); auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>()); auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container->set_layout<GUI::VerticalBoxLayout>(); mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_string)); auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline"_string);
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_string)); auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill"_string);
auto aa_enable_checkbox = TRY(mode_radio_container->try_add<GUI::CheckBox>("Anti-alias"_string)); auto& aa_enable_checkbox = mode_radio_container.add<GUI::CheckBox>("Anti-alias"_string);
aa_enable_checkbox->on_checked = [this](bool checked) { aa_enable_checkbox.on_checked = [this](bool checked) {
m_antialias_enabled = checked; m_antialias_enabled = checked;
}; };
outline_mode_radio->on_checked = [this](bool checked) { outline_mode_radio.on_checked = [this](bool checked) {
if (checked) if (checked)
m_fill_mode = FillMode::Outline; m_fill_mode = FillMode::Outline;
}; };
fill_mode_radio->on_checked = [this](bool checked) { fill_mode_radio.on_checked = [this](bool checked) {
if (checked) if (checked)
m_fill_mode = FillMode::Fill; m_fill_mode = FillMode::Fill;
}; };
aa_enable_checkbox->set_checked(true); aa_enable_checkbox.set_checked(true);
outline_mode_radio->set_checked(true); outline_mode_radio.set_checked(true);
auto aspect_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& aspect_container = properties_widget->add<GUI::Widget>();
aspect_container->set_fixed_height(20); aspect_container.set_fixed_height(20);
aspect_container->set_layout<GUI::HorizontalBoxLayout>(); aspect_container.set_layout<GUI::HorizontalBoxLayout>();
auto aspect_label = TRY(aspect_container->try_add<GUI::Label>("Aspect Ratio:"_string)); auto& aspect_label = aspect_container.add<GUI::Label>("Aspect Ratio:"_string);
aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); aspect_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label->set_fixed_size(80, 20); aspect_label.set_fixed_size(80, 20);
m_aspect_w_textbox = TRY(aspect_container->try_add<GUI::TextBox>()); m_aspect_w_textbox = aspect_container.add<GUI::TextBox>();
m_aspect_w_textbox->set_fixed_height(20); m_aspect_w_textbox->set_fixed_height(20);
m_aspect_w_textbox->set_fixed_width(25); m_aspect_w_textbox->set_fixed_width(25);
m_aspect_w_textbox->on_change = [this] { m_aspect_w_textbox->on_change = [this] {
@ -197,11 +197,11 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
} }
}; };
auto multiply_label = TRY(aspect_container->try_add<GUI::Label>("x"_string)); auto& multiply_label = aspect_container.add<GUI::Label>("x"_string);
multiply_label->set_text_alignment(Gfx::TextAlignment::Center); multiply_label.set_text_alignment(Gfx::TextAlignment::Center);
multiply_label->set_fixed_size(10, 20); multiply_label.set_fixed_size(10, 20);
m_aspect_h_textbox = TRY(aspect_container->try_add<GUI::TextBox>()); m_aspect_h_textbox = aspect_container.add<GUI::TextBox>();
m_aspect_h_textbox->set_fixed_height(20); m_aspect_h_textbox->set_fixed_height(20);
m_aspect_h_textbox->set_fixed_width(25); m_aspect_h_textbox->set_fixed_width(25);
m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); }; m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); };

94
Userland/Applications/PixelPaint/Tools/EraseTool.cpp
View file

@ -60,78 +60,78 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& size_container = properties_widget->add<GUI::Widget>();
size_container->set_fixed_height(20); size_container.set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>(); size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string)); auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20); size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider->set_range(1, 250); size_slider.set_range(1, 250);
size_slider->set_value(size()); size_slider.set_value(size());
size_slider->on_change = [this, size_slider](int value) { size_slider.on_change = [this, &size_slider](int value) {
set_size(value); set_size(value);
size_slider->set_override_cursor(cursor()); size_slider.set_override_cursor(cursor());
}; };
set_primary_slider(size_slider); set_primary_slider(&size_slider);
auto hardness_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container->set_fixed_height(20); hardness_container.set_fixed_height(20);
hardness_container->set_layout<GUI::HorizontalBoxLayout>(); hardness_container.set_layout<GUI::HorizontalBoxLayout>();
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string)); auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20); hardness_label.set_fixed_size(80, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider->set_range(1, 100); hardness_slider.set_range(1, 100);
hardness_slider->set_value(hardness()); hardness_slider.set_value(hardness());
hardness_slider->on_change = [this](int value) { hardness_slider.on_change = [this](int value) {
set_hardness(value); set_hardness(value);
}; };
set_secondary_slider(hardness_slider); set_secondary_slider(&hardness_slider);
auto secondary_color_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& secondary_color_container = properties_widget->add<GUI::Widget>();
secondary_color_container->set_fixed_height(20); secondary_color_container.set_fixed_height(20);
secondary_color_container->set_layout<GUI::HorizontalBoxLayout>(); secondary_color_container.set_layout<GUI::HorizontalBoxLayout>();
auto use_secondary_color_checkbox = TRY(secondary_color_container->try_add<GUI::CheckBox>()); auto& use_secondary_color_checkbox = secondary_color_container.add<GUI::CheckBox>();
use_secondary_color_checkbox->set_checked(m_use_secondary_color); use_secondary_color_checkbox.set_checked(m_use_secondary_color);
use_secondary_color_checkbox->set_text("Use secondary color"_string); use_secondary_color_checkbox.set_text("Use secondary color"_string);
use_secondary_color_checkbox->on_checked = [this](bool checked) { use_secondary_color_checkbox.on_checked = [this](bool checked) {
m_use_secondary_color = checked; m_use_secondary_color = checked;
}; };
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(46); mode_container.set_fixed_height(46);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Draw Mode:"_string)); auto& mode_label = mode_container.add<GUI::Label>("Draw Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label.set_fixed_size(80, 20);
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>()); auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container->set_layout<GUI::VerticalBoxLayout>(); mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto pencil_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Pencil"_string)); auto& pencil_mode_radio = mode_radio_container.add<GUI::RadioButton>("Pencil"_string);
auto brush_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Brush"_string)); auto& brush_mode_radio = mode_radio_container.add<GUI::RadioButton>("Brush"_string);
pencil_mode_radio->on_checked = [this, hardness_slider, size_slider](bool) { pencil_mode_radio.on_checked = [this, &hardness_slider, &size_slider](bool) {
m_draw_mode = DrawMode::Pencil; m_draw_mode = DrawMode::Pencil;
hardness_slider->set_enabled(false); hardness_slider.set_enabled(false);
refresh_editor_cursor(); refresh_editor_cursor();
size_slider->set_override_cursor(cursor()); size_slider.set_override_cursor(cursor());
}; };
brush_mode_radio->on_checked = [this, hardness_slider, size_slider](bool) { brush_mode_radio.on_checked = [this, &hardness_slider, &size_slider](bool) {
m_draw_mode = DrawMode::Brush; m_draw_mode = DrawMode::Brush;
hardness_slider->set_enabled(true); hardness_slider.set_enabled(true);
refresh_editor_cursor(); refresh_editor_cursor();
size_slider->set_override_cursor(cursor()); size_slider.set_override_cursor(cursor());
}; };
pencil_mode_radio->set_checked(true); pencil_mode_radio.set_checked(true);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

86
Userland/Applications/PixelPaint/Tools/GradientTool.cpp
View file

@ -204,12 +204,12 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(20); mode_container.set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Gradient Type:"_string)); auto& mode_label = mode_container.add<GUI::Label>("Gradient Type:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label.set_fixed_size(80, 20);
static constexpr auto s_mode_names = [] { static constexpr auto s_mode_names = [] {
Array<StringView, (int)GradientMode::__Count> names; Array<StringView, (int)GradientMode::__Count> names;
@ -228,36 +228,36 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
return names; return names;
}(); }();
auto mode_combobox = TRY(mode_container->try_add<GUI::ComboBox>()); auto& mode_combobox = mode_container.add<GUI::ComboBox>();
mode_combobox->set_only_allow_values_from_model(true); mode_combobox.set_only_allow_values_from_model(true);
mode_combobox->set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names)); mode_combobox.set_model(*GUI::ItemListModel<StringView, decltype(s_mode_names)>::create(s_mode_names));
mode_combobox->set_selected_index((int)m_mode, GUI::AllowCallback::No); mode_combobox.set_selected_index((int)m_mode, GUI::AllowCallback::No);
auto opacity_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& opacity_container = properties_widget->add<GUI::Widget>();
opacity_container->set_fixed_height(20); opacity_container.set_fixed_height(20);
opacity_container->set_layout<GUI::HorizontalBoxLayout>(); opacity_container.set_layout<GUI::HorizontalBoxLayout>();
auto opacity_label = TRY(opacity_container->try_add<GUI::Label>("Opacity:"_string)); auto& opacity_label = opacity_container.add<GUI::Label>("Opacity:"_string);
opacity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); opacity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
opacity_label->set_fixed_size(80, 20); opacity_label.set_fixed_size(80, 20);
auto opacity_slider = TRY(opacity_container->try_add<GUI::HorizontalOpacitySlider>()); auto& opacity_slider = opacity_container.add<GUI::HorizontalOpacitySlider>();
opacity_slider->set_range(1, 100); opacity_slider.set_range(1, 100);
opacity_slider->set_value(100); opacity_slider.set_value(100);
opacity_slider->on_change = [this](int value) { opacity_slider.on_change = [this](int value) {
m_opacity = value; m_opacity = value;
m_editor->update(); m_editor->update();
}; };
set_primary_slider(opacity_slider); set_primary_slider(&opacity_slider);
auto hardness_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& hardness_container = properties_widget->add<GUI::Widget>();
hardness_container->set_layout<GUI::HorizontalBoxLayout>(); hardness_container.set_layout<GUI::HorizontalBoxLayout>();
hardness_container->set_fixed_height(20); hardness_container.set_fixed_height(20);
hardness_container->set_visible(m_mode == GradientMode::Radial); hardness_container.set_visible(m_mode == GradientMode::Radial);
mode_combobox->on_change = [this, hardness_container](auto&, auto& model_index) { mode_combobox.on_change = [this, &hardness_container](auto&, auto& model_index) {
VERIFY(model_index.row() >= 0); VERIFY(model_index.row() >= 0);
VERIFY(model_index.row() < (int)GradientMode::__Count); VERIFY(model_index.row() < (int)GradientMode::__Count);
@ -268,37 +268,37 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
reset(); reset();
} }
hardness_container->set_visible(m_mode == GradientMode::Radial); hardness_container.set_visible(m_mode == GradientMode::Radial);
}; };
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string)); auto& hardness_label = hardness_container.add<GUI::Label>("Hardness:"_string);
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20); hardness_label.set_fixed_size(80, 20);
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& hardness_slider = hardness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
hardness_slider->set_range(1, 99); hardness_slider.set_range(1, 99);
hardness_slider->set_value(m_hardness); hardness_slider.set_value(m_hardness);
hardness_slider->on_change = [this](int value) { hardness_slider.on_change = [this](int value) {
if (m_mode == GradientMode::Radial && m_editor) { if (m_mode == GradientMode::Radial && m_editor) {
m_hardness = value; m_hardness = value;
m_editor->update(); m_editor->update();
} }
}; };
set_secondary_slider(hardness_slider); set_secondary_slider(&hardness_slider);
auto use_secondary_color_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>("Use secondary color"_string)); auto& use_secondary_color_checkbox = properties_widget->add<GUI::CheckBox>("Use secondary color"_string);
use_secondary_color_checkbox->on_checked = [this](bool checked) { use_secondary_color_checkbox.on_checked = [this](bool checked) {
m_use_secondary_color = checked; m_use_secondary_color = checked;
m_editor->update(); m_editor->update();
}; };
auto button_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& button_container = properties_widget->add<GUI::Widget>();
button_container->set_fixed_height(22); button_container.set_fixed_height(22);
button_container->set_layout<GUI::HorizontalBoxLayout>(); button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container->add_spacer(); button_container.add_spacer();
auto apply_button = TRY(button_container->try_add<GUI::DialogButton>("Apply"_string)); auto& apply_button = button_container.add<GUI::DialogButton>("Apply"_string);
apply_button->on_click = [this](auto) { apply_button.on_click = [this](auto) {
rasterize_gradient(); rasterize_gradient();
}; };
m_properties_widget = properties_widget; m_properties_widget = properties_widget;

24
Userland/Applications/PixelPaint/Tools/GuideTool.cpp
View file

@ -182,23 +182,23 @@ ErrorOr<GUI::Widget*> GuideTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto snapping_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& snapping_container = properties_widget->add<GUI::Widget>();
snapping_container->set_fixed_height(20); snapping_container.set_fixed_height(20);
snapping_container->set_layout<GUI::HorizontalBoxLayout>(); snapping_container.set_layout<GUI::HorizontalBoxLayout>();
auto snapping_label = TRY(snapping_container->try_add<GUI::Label>("Snap offset:"_string)); auto& snapping_label = snapping_container.add<GUI::Label>("Snap offset:"_string);
snapping_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); snapping_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
snapping_label->set_fixed_size(80, 20); snapping_label.set_fixed_size(80, 20);
snapping_label->set_tooltip_deprecated("Press Shift to snap"); snapping_label.set_tooltip_deprecated("Press Shift to snap");
auto snapping_slider = TRY(snapping_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& snapping_slider = snapping_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
snapping_slider->set_range(0, 50); snapping_slider.set_range(0, 50);
snapping_slider->set_value(m_snap_size); snapping_slider.set_value(m_snap_size);
snapping_slider->on_change = [this](int value) { snapping_slider.on_change = [this](int value) {
m_snap_size = value; m_snap_size = value;
}; };
set_primary_slider(snapping_slider); set_primary_slider(&snapping_slider);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

24
Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp
View file

@ -163,14 +163,14 @@ ErrorOr<GUI::Widget*> LassoSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(20); mode_container.set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>()); auto& mode_label = mode_container.add<GUI::Label>();
mode_label->set_text("Mode:"_string); mode_label.set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label.set_fixed_size(80, 20);
static constexpr auto s_merge_mode_names = [] { static constexpr auto s_merge_mode_names = [] {
Array<StringView, (int)Selection::MergeMode::__Count> names; Array<StringView, (int)Selection::MergeMode::__Count> names;
@ -195,11 +195,11 @@ ErrorOr<GUI::Widget*> LassoSelectTool::get_properties_widget()
return names; return names;
}(); }();
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>()); auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo->set_only_allow_values_from_model(true); mode_combo.set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names)); mode_combo.set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode); mode_combo.set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0); VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count); VERIFY(index.row() < (int)Selection::MergeMode::__Count);

40
Userland/Applications/PixelPaint/Tools/LineTool.cpp
View file

@ -125,36 +125,36 @@ ErrorOr<GUI::Widget*> LineTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto thickness_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& thickness_container = properties_widget->add<GUI::Widget>();
thickness_container->set_fixed_height(20); thickness_container.set_fixed_height(20);
thickness_container->set_layout<GUI::HorizontalBoxLayout>(); thickness_container.set_layout<GUI::HorizontalBoxLayout>();
auto thickness_label = TRY(thickness_container->try_add<GUI::Label>("Thickness:"_string)); auto& thickness_label = thickness_container.add<GUI::Label>("Thickness:"_string);
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label->set_fixed_size(80, 20); thickness_label.set_fixed_size(80, 20);
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& thickness_slider = thickness_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
thickness_slider->set_range(1, 10); thickness_slider.set_range(1, 10);
thickness_slider->set_value(m_thickness); thickness_slider.set_value(m_thickness);
thickness_slider->on_change = [this](int value) { thickness_slider.on_change = [this](int value) {
m_thickness = value; m_thickness = value;
}; };
set_primary_slider(thickness_slider); set_primary_slider(&thickness_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(20); mode_container.set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string)); auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label.set_fixed_size(80, 20);
auto aa_enable_checkbox = TRY(mode_container->try_add<GUI::CheckBox>("Anti-alias"_string)); auto& aa_enable_checkbox = mode_container.add<GUI::CheckBox>("Anti-alias"_string);
aa_enable_checkbox->on_checked = [this](bool checked) { aa_enable_checkbox.on_checked = [this](bool checked) {
m_antialias_enabled = checked; m_antialias_enabled = checked;
}; };
aa_enable_checkbox->set_checked(true); aa_enable_checkbox.set_checked(true);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

20
Userland/Applications/PixelPaint/Tools/MoveTool.cpp
View file

@ -295,18 +295,18 @@ ErrorOr<GUI::Widget*> MoveTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto selection_mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& selection_mode_container = properties_widget->add<GUI::Widget>();
selection_mode_container->set_layout<GUI::HorizontalBoxLayout>(); selection_mode_container.set_layout<GUI::HorizontalBoxLayout>();
selection_mode_container->set_fixed_height(46); selection_mode_container.set_fixed_height(46);
auto selection_mode_label = TRY(selection_mode_container->try_add<GUI::Label>("Selection Mode:"_string)); auto& selection_mode_label = selection_mode_container.add<GUI::Label>("Selection Mode:"_string);
selection_mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); selection_mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
selection_mode_label->set_fixed_size(80, 40); selection_mode_label.set_fixed_size(80, 40);
auto mode_radio_container = TRY(selection_mode_container->try_add<GUI::Widget>()); auto& mode_radio_container = selection_mode_container.add<GUI::Widget>();
mode_radio_container->set_layout<GUI::VerticalBoxLayout>(); mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
m_selection_mode_foreground = TRY(mode_radio_container->try_add<GUI::RadioButton>("Foreground"_string)); m_selection_mode_foreground = mode_radio_container.add<GUI::RadioButton>("Foreground"_string);
m_selection_mode_active = TRY(mode_radio_container->try_add<GUI::RadioButton>("Active Layer"_string)); m_selection_mode_active = mode_radio_container.add<GUI::RadioButton>("Active Layer"_string);
m_selection_mode_foreground->on_checked = [this](bool) { m_selection_mode_foreground->on_checked = [this](bool) {
m_layer_selection_mode = LayerSelectionMode::ForegroundLayer; m_layer_selection_mode = LayerSelectionMode::ForegroundLayer;

22
Userland/Applications/PixelPaint/Tools/PenTool.cpp
View file

@ -41,22 +41,22 @@ ErrorOr<GUI::Widget*> PenTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& size_container = properties_widget->add<GUI::Widget>();
size_container->set_fixed_height(20); size_container.set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>(); size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Thickness:"_string)); auto& size_label = size_container.add<GUI::Label>("Thickness:"_string);
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20); size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider->set_range(1, 20); size_slider.set_range(1, 20);
size_slider->set_value(size()); size_slider.set_value(size());
size_slider->on_change = [this](int value) { size_slider.on_change = [this](int value) {
set_size(value); set_size(value);
}; };
set_primary_slider(size_slider); set_primary_slider(&size_slider);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

6
Userland/Applications/PixelPaint/Tools/PickerTool.cpp
View file

@ -47,9 +47,9 @@ ErrorOr<GUI::Widget*> PickerTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto sample_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>("Sample all layers"_string)); auto& sample_checkbox = properties_widget->add<GUI::CheckBox>("Sample all layers"_string);
sample_checkbox->set_checked(m_sample_all_layers); sample_checkbox.set_checked(m_sample_all_layers);
sample_checkbox->on_checked = [this](bool value) { sample_checkbox.on_checked = [this](bool value) {
m_sample_all_layers = value; m_sample_all_layers = value;
}; };
m_properties_widget = properties_widget; m_properties_widget = properties_widget;

24
Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp
View file

@ -192,14 +192,14 @@ ErrorOr<GUI::Widget*> PolygonalSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(20); mode_container.set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>()); auto& mode_label = mode_container.add<GUI::Label>();
mode_label->set_text("Mode:"_string); mode_label.set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label.set_fixed_size(80, 20);
static constexpr auto s_merge_mode_names = [] { static constexpr auto s_merge_mode_names = [] {
Array<StringView, (int)Selection::MergeMode::__Count> names; Array<StringView, (int)Selection::MergeMode::__Count> names;
@ -224,11 +224,11 @@ ErrorOr<GUI::Widget*> PolygonalSelectTool::get_properties_widget()
return names; return names;
}(); }();
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>()); auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo->set_only_allow_values_from_model(true); mode_combo.set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names)); mode_combo.set_model(*GUI::ItemListModel<StringView, decltype(s_merge_mode_names)>::create(s_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode); mode_combo.set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0); VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count); VERIFY(index.row() < (int)Selection::MergeMode::__Count);

48
Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp
View file

@ -160,33 +160,33 @@ ErrorOr<GUI::Widget*> RectangleSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto feather_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& feather_container = properties_widget->add<GUI::Widget>();
feather_container->set_fixed_height(20); feather_container.set_fixed_height(20);
feather_container->set_layout<GUI::HorizontalBoxLayout>(); feather_container.set_layout<GUI::HorizontalBoxLayout>();
auto feather_label = TRY(feather_container->try_add<GUI::Label>()); auto& feather_label = feather_container.add<GUI::Label>();
feather_label->set_text("Feather:"_string); feather_label.set_text("Feather:"_string);
feather_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); feather_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
feather_label->set_fixed_size(80, 20); feather_label.set_fixed_size(80, 20);
int const feather_slider_max = 100; int const feather_slider_max = 100;
auto feather_slider = TRY(feather_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& feather_slider = feather_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
feather_slider->set_range(0, feather_slider_max); feather_slider.set_range(0, feather_slider_max);
feather_slider->set_value((int)floorf(m_edge_feathering * (float)feather_slider_max)); feather_slider.set_value((int)floorf(m_edge_feathering * (float)feather_slider_max));
feather_slider->on_change = [this](int value) { feather_slider.on_change = [this](int value) {
m_edge_feathering = (float)value / (float)feather_slider_max; m_edge_feathering = (float)value / (float)feather_slider_max;
}; };
set_primary_slider(feather_slider); set_primary_slider(&feather_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(20); mode_container.set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>()); auto& mode_label = mode_container.add<GUI::Label>();
mode_label->set_text("Mode:"_string); mode_label.set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label.set_fixed_size(80, 20);
for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) { for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) {
switch ((Selection::MergeMode)i) { switch ((Selection::MergeMode)i) {
@ -207,11 +207,11 @@ ErrorOr<GUI::Widget*> RectangleSelectTool::get_properties_widget()
} }
} }
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>()); auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo->set_only_allow_values_from_model(true); mode_combo.set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names)); mode_combo.set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode); mode_combo.set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0); VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count); VERIFY(index.row() < (int)Selection::MergeMode::__Count);

100
Userland/Applications/PixelPaint/Tools/RectangleTool.cpp
View file

@ -146,28 +146,28 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto thickness_or_radius_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& thickness_or_radius_container = properties_widget->add<GUI::Widget>();
thickness_or_radius_container->set_fixed_height(20); thickness_or_radius_container.set_fixed_height(20);
thickness_or_radius_container->set_layout<GUI::HorizontalBoxLayout>(); thickness_or_radius_container.set_layout<GUI::HorizontalBoxLayout>();
auto thickness_or_radius_label = TRY(thickness_or_radius_container->try_add<GUI::Label>()); auto& thickness_or_radius_label = thickness_or_radius_container.add<GUI::Label>();
thickness_or_radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_or_radius_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_or_radius_label->set_fixed_size(80, 20); thickness_or_radius_label.set_fixed_size(80, 20);
auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& thickness_or_radius_slider = thickness_or_radius_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
thickness_or_radius_slider->on_change = [&](int value) { thickness_or_radius_slider.on_change = [&](int value) {
if (m_fill_mode == FillMode::RoundedCorners) { if (m_fill_mode == FillMode::RoundedCorners) {
m_corner_radius = value; m_corner_radius = value;
} else } else
m_thickness = value; m_thickness = value;
}; };
auto update_slider = [this, thickness_or_radius_label, thickness_or_radius_slider] { auto update_slider = [this, &thickness_or_radius_label, &thickness_or_radius_slider] {
auto update_values = [&](auto label, int value, int range_min, int range_max = 10) { auto update_values = [&](auto label, int value, int range_min, int range_max = 10) {
thickness_or_radius_label->set_text(String::from_utf8(label).release_value_but_fixme_should_propagate_errors()); thickness_or_radius_label.set_text(String::from_utf8(label).release_value_but_fixme_should_propagate_errors());
thickness_or_radius_slider->set_range(range_min, range_max); thickness_or_radius_slider.set_range(range_min, range_max);
thickness_or_radius_slider->set_value(value); thickness_or_radius_slider.set_value(value);
}; };
if (m_fill_mode == FillMode::RoundedCorners) if (m_fill_mode == FillMode::RoundedCorners)
update_values("Radius:"sv, m_corner_radius, 0, 50); update_values("Radius:"sv, m_corner_radius, 0, 50);
@ -176,64 +176,64 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
}; };
update_slider(); update_slider();
set_primary_slider(thickness_or_radius_slider); set_primary_slider(&thickness_or_radius_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(90); mode_container.set_fixed_height(90);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string)); auto& mode_label = mode_container.add<GUI::Label>("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(30, 20); mode_label.set_fixed_size(30, 20);
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>()); auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container->set_layout<GUI::VerticalBoxLayout>(); mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_string)); auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline"_string);
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_string)); auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill"_string);
auto gradient_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Gradient"_string)); auto& gradient_mode_radio = mode_radio_container.add<GUI::RadioButton>("Gradient"_string);
mode_radio_container->set_fixed_width(70); mode_radio_container.set_fixed_width(70);
auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Rounded"_string)); auto& rounded_corners_mode_radio = mode_radio_container.add<GUI::RadioButton>("Rounded"_string);
outline_mode_radio->on_checked = [this, update_slider](bool) { outline_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::Outline; m_fill_mode = FillMode::Outline;
update_slider(); update_slider();
}; };
fill_mode_radio->on_checked = [this, update_slider](bool) { fill_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::Fill; m_fill_mode = FillMode::Fill;
update_slider(); update_slider();
}; };
gradient_mode_radio->on_checked = [this, update_slider](bool) { gradient_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::Gradient; m_fill_mode = FillMode::Gradient;
update_slider(); update_slider();
}; };
rounded_corners_mode_radio->on_checked = [this, update_slider](bool) { rounded_corners_mode_radio.on_checked = [this, update_slider](bool) {
m_fill_mode = FillMode::RoundedCorners; m_fill_mode = FillMode::RoundedCorners;
update_slider(); update_slider();
}; };
outline_mode_radio->set_checked(true); outline_mode_radio.set_checked(true);
auto mode_extras_container = TRY(mode_container->try_add<GUI::Widget>()); auto& mode_extras_container = mode_container.add<GUI::Widget>();
mode_extras_container->set_layout<GUI::VerticalBoxLayout>(); mode_extras_container.set_layout<GUI::VerticalBoxLayout>();
auto aa_enable_checkbox = TRY(mode_extras_container->try_add<GUI::CheckBox>("Anti-alias"_string)); auto& aa_enable_checkbox = mode_extras_container.add<GUI::CheckBox>("Anti-alias"_string);
aa_enable_checkbox->on_checked = [this](bool checked) { aa_enable_checkbox.on_checked = [this](bool checked) {
m_antialias_enabled = checked; m_antialias_enabled = checked;
}; };
aa_enable_checkbox->set_checked(true); aa_enable_checkbox.set_checked(true);
auto aspect_container = TRY(mode_extras_container->try_add<GUI::Widget>()); auto& aspect_container = mode_extras_container.add<GUI::Widget>();
aspect_container->set_layout<GUI::VerticalBoxLayout>(); aspect_container.set_layout<GUI::VerticalBoxLayout>();
aspect_container->set_fixed_width(75); aspect_container.set_fixed_width(75);
auto aspect_label = TRY(aspect_container->try_add<GUI::Label>("Aspect Ratio:"_string)); auto& aspect_label = aspect_container.add<GUI::Label>("Aspect Ratio:"_string);
aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); aspect_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label->set_fixed_size(75, 20); aspect_label.set_fixed_size(75, 20);
auto aspect_fields_container = TRY(aspect_container->try_add<GUI::Widget>()); auto& aspect_fields_container = aspect_container.add<GUI::Widget>();
aspect_fields_container->set_fixed_width(75); aspect_fields_container.set_fixed_width(75);
aspect_fields_container->set_layout<GUI::HorizontalBoxLayout>(); aspect_fields_container.set_layout<GUI::HorizontalBoxLayout>();
m_aspect_w_textbox = TRY(aspect_fields_container->try_add<GUI::TextBox>()); m_aspect_w_textbox = aspect_fields_container.add<GUI::TextBox>();
m_aspect_w_textbox->set_fixed_height(20); m_aspect_w_textbox->set_fixed_height(20);
m_aspect_w_textbox->set_fixed_width(25); m_aspect_w_textbox->set_fixed_width(25);
m_aspect_w_textbox->on_change = [this] { m_aspect_w_textbox->on_change = [this] {
@ -246,11 +246,11 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
} }
}; };
auto multiply_label = TRY(aspect_fields_container->try_add<GUI::Label>("x"_string)); auto& multiply_label = aspect_fields_container.add<GUI::Label>("x"_string);
multiply_label->set_text_alignment(Gfx::TextAlignment::Center); multiply_label.set_text_alignment(Gfx::TextAlignment::Center);
multiply_label->set_fixed_size(10, 20); multiply_label.set_fixed_size(10, 20);
m_aspect_h_textbox = TRY(aspect_fields_container->try_add<GUI::TextBox>()); m_aspect_h_textbox = aspect_fields_container.add<GUI::TextBox>();
m_aspect_h_textbox->set_fixed_height(20); m_aspect_h_textbox->set_fixed_height(20);
m_aspect_h_textbox->set_fixed_width(25); m_aspect_h_textbox->set_fixed_width(25);
m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); }; m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); };

44
Userland/Applications/PixelPaint/Tools/SprayTool.cpp
View file

@ -96,39 +96,39 @@ ErrorOr<GUI::Widget*> SprayTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto size_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& size_container = properties_widget->add<GUI::Widget>();
size_container->set_fixed_height(20); size_container.set_fixed_height(20);
size_container->set_layout<GUI::HorizontalBoxLayout>(); size_container.set_layout<GUI::HorizontalBoxLayout>();
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string)); auto& size_label = size_container.add<GUI::Label>("Size:"_string);
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20); size_label.set_fixed_size(80, 20);
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string)); auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string);
size_slider->set_range(1, 20); size_slider.set_range(1, 20);
size_slider->set_value(m_thickness); size_slider.set_value(m_thickness);
size_slider->on_change = [this](int value) { size_slider.on_change = [this](int value) {
m_thickness = value; m_thickness = value;
}; };
set_primary_slider(size_slider); set_primary_slider(&size_slider);
auto density_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& density_container = properties_widget->add<GUI::Widget>();
density_container->set_fixed_height(20); density_container.set_fixed_height(20);
density_container->set_layout<GUI::HorizontalBoxLayout>(); density_container.set_layout<GUI::HorizontalBoxLayout>();
auto density_label = TRY(density_container->try_add<GUI::Label>("Density:"_string)); auto& density_label = density_container.add<GUI::Label>("Density:"_string);
density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); density_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
density_label->set_fixed_size(80, 20); density_label.set_fixed_size(80, 20);
auto density_slider = TRY(density_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& density_slider = density_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
density_slider->set_range(1, 100); density_slider.set_range(1, 100);
density_slider->set_value(m_density); density_slider.set_value(m_density);
density_slider->on_change = [this](int value) { density_slider.on_change = [this](int value) {
m_density = value; m_density = value;
}; };
set_secondary_slider(density_slider); set_secondary_slider(&density_slider);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

10
Userland/Applications/PixelPaint/Tools/TextTool.cpp
View file

@ -111,13 +111,13 @@ ErrorOr<GUI::Widget*> TextTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto font_header = TRY(properties_widget->try_add<GUI::Label>("Current Font:"_string)); auto& font_header = properties_widget->add<GUI::Label>("Current Font:"_string);
font_header->set_text_alignment(Gfx::TextAlignment::CenterLeft); font_header.set_text_alignment(Gfx::TextAlignment::CenterLeft);
m_font_label = TRY(properties_widget->try_add<GUI::Label>(m_selected_font->human_readable_name())); m_font_label = properties_widget->add<GUI::Label>(m_selected_font->human_readable_name());
auto change_font_button = TRY(properties_widget->try_add<GUI::Button>("Change Font..."_string)); auto& change_font_button = properties_widget->add<GUI::Button>("Change Font..."_string);
change_font_button->on_click = [this](auto) { change_font_button.on_click = [this](auto) {
auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false); auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false);
if (picker->exec() == GUI::Dialog::ExecResult::OK) { if (picker->exec() == GUI::Dialog::ExecResult::OK) {
m_font_label->set_text(picker->font()->human_readable_name()); m_font_label->set_text(picker->font()->human_readable_name());

46
Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp
View file

@ -75,31 +75,31 @@ ErrorOr<GUI::Widget*> WandSelectTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto threshold_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& threshold_container = properties_widget->add<GUI::Widget>();
threshold_container->set_fixed_height(20); threshold_container.set_fixed_height(20);
threshold_container->set_layout<GUI::HorizontalBoxLayout>(); threshold_container.set_layout<GUI::HorizontalBoxLayout>();
auto threshold_label = TRY(threshold_container->try_add<GUI::Label>("Threshold:"_string)); auto& threshold_label = threshold_container.add<GUI::Label>("Threshold:"_string);
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); threshold_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label->set_fixed_size(80, 20); threshold_label.set_fixed_size(80, 20);
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& threshold_slider = threshold_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
threshold_slider->set_range(0, 100); threshold_slider.set_range(0, 100);
threshold_slider->set_value(m_threshold); threshold_slider.set_value(m_threshold);
threshold_slider->on_change = [this](int value) { threshold_slider.on_change = [this](int value) {
m_threshold = value; m_threshold = value;
}; };
set_primary_slider(threshold_slider); set_primary_slider(&threshold_slider);
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& mode_container = properties_widget->add<GUI::Widget>();
mode_container->set_fixed_height(20); mode_container.set_fixed_height(20);
mode_container->set_layout<GUI::HorizontalBoxLayout>(); mode_container.set_layout<GUI::HorizontalBoxLayout>();
auto mode_label = TRY(mode_container->try_add<GUI::Label>()); auto& mode_label = mode_container.add<GUI::Label>();
mode_label->set_text("Mode:"_string); mode_label.set_text("Mode:"_string);
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label.set_fixed_size(80, 20);
for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) { for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) {
switch ((Selection::MergeMode)i) { switch ((Selection::MergeMode)i) {
@ -120,11 +120,11 @@ ErrorOr<GUI::Widget*> WandSelectTool::get_properties_widget()
} }
} }
auto mode_combo = TRY(mode_container->try_add<GUI::ComboBox>()); auto& mode_combo = mode_container.add<GUI::ComboBox>();
mode_combo->set_only_allow_values_from_model(true); mode_combo.set_only_allow_values_from_model(true);
mode_combo->set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names)); mode_combo.set_model(*GUI::ItemListModel<DeprecatedString>::create(m_merge_mode_names));
mode_combo->set_selected_index((int)m_merge_mode); mode_combo.set_selected_index((int)m_merge_mode);
mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) {
VERIFY(index.row() >= 0); VERIFY(index.row() >= 0);
VERIFY(index.row() < (int)Selection::MergeMode::__Count); VERIFY(index.row() < (int)Selection::MergeMode::__Count);

22
Userland/Applications/PixelPaint/Tools/ZoomTool.cpp
View file

@ -29,22 +29,22 @@ ErrorOr<GUI::Widget*> ZoomTool::get_properties_widget()
auto properties_widget = GUI::Widget::construct(); auto properties_widget = GUI::Widget::construct();
properties_widget->set_layout<GUI::VerticalBoxLayout>(); properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto sensitivity_container = TRY(properties_widget->try_add<GUI::Widget>()); auto& sensitivity_container = properties_widget->add<GUI::Widget>();
sensitivity_container->set_fixed_height(20); sensitivity_container.set_fixed_height(20);
sensitivity_container->set_layout<GUI::HorizontalBoxLayout>(); sensitivity_container.set_layout<GUI::HorizontalBoxLayout>();
auto sensitivity_label = TRY(sensitivity_container->try_add<GUI::Label>("Sensitivity:"_string)); auto& sensitivity_label = sensitivity_container.add<GUI::Label>("Sensitivity:"_string);
sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); sensitivity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
sensitivity_label->set_fixed_size(80, 20); sensitivity_label.set_fixed_size(80, 20);
auto sensitivity_slider = TRY(sensitivity_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string)); auto& sensitivity_slider = sensitivity_container.add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string);
sensitivity_slider->set_range(1, 100); sensitivity_slider.set_range(1, 100);
sensitivity_slider->set_value(100 * m_sensitivity); sensitivity_slider.set_value(100 * m_sensitivity);
sensitivity_slider->on_change = [this](int value) { sensitivity_slider.on_change = [this](int value) {
m_sensitivity = value / 100.0f; m_sensitivity = value / 100.0f;
}; };
set_primary_slider(sensitivity_slider); set_primary_slider(&sensitivity_slider);
m_properties_widget = properties_widget; m_properties_widget = properties_widget;
} }

20
Userland/Applications/Settings/main.cpp
View file

@ -105,16 +105,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
main_widget->set_layout<GUI::VerticalBoxLayout>(); main_widget->set_layout<GUI::VerticalBoxLayout>();
auto icon_view = TRY(main_widget->try_add<GUI::IconView>()); auto& icon_view = main_widget->add<GUI::IconView>();
icon_view->set_should_hide_unnecessary_scrollbars(true); icon_view.set_should_hide_unnecessary_scrollbars(true);
auto model = adopt_ref(*new SettingsAppsModel); auto model = adopt_ref(*new SettingsAppsModel);
icon_view->set_model(*model); icon_view.set_model(*model);
icon_view->on_activation = [&](GUI::ModelIndex const& index) { icon_view.on_activation = [&](GUI::ModelIndex const& index) {
auto executable = model->data(index, GUI::ModelRole::Custom).as_string(); auto executable = model->data(index, GUI::ModelRole::Custom).as_string();
auto requires_root = model->data(index, static_cast<GUI::ModelRole>(SettingsAppsModelCustomRole::RequiresRoot)).as_bool(); auto requires_root = model->data(index, static_cast<GUI::ModelRole>(SettingsAppsModelCustomRole::RequiresRoot)).as_bool();
auto launch_origin_rect = icon_view->to_widget_rect(icon_view->content_rect(index)).translated(icon_view->screen_relative_rect().location()); auto launch_origin_rect = icon_view.to_widget_rect(icon_view.content_rect(index)).translated(icon_view.screen_relative_rect().location());
setenv("__libgui_launch_origin_rect", DeprecatedString::formatted("{},{},{},{}", launch_origin_rect.x(), launch_origin_rect.y(), launch_origin_rect.width(), launch_origin_rect.height()).characters(), 1); setenv("__libgui_launch_origin_rect", DeprecatedString::formatted("{},{},{},{}", launch_origin_rect.x(), launch_origin_rect.y(), launch_origin_rect.width(), launch_origin_rect.height()).characters(), 1);
if (requires_root) if (requires_root)
@ -123,17 +123,17 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
GUI::Process::spawn_or_show_error(window, executable); GUI::Process::spawn_or_show_error(window, executable);
}; };
auto statusbar = TRY(main_widget->try_add<GUI::Statusbar>()); auto& statusbar = main_widget->add<GUI::Statusbar>();
icon_view->on_selection_change = [&] { icon_view.on_selection_change = [&] {
auto index = icon_view->selection().first(); auto index = icon_view.selection().first();
if (!index.is_valid()) { if (!index.is_valid()) {
statusbar->set_text({}); statusbar.set_text({});
return; return;
} }
auto& app = *(NonnullRefPtr<Desktop::AppFile>*)index.internal_data(); auto& app = *(NonnullRefPtr<Desktop::AppFile>*)index.internal_data();
statusbar->set_text(String::from_deprecated_string(app->description()).release_value_but_fixme_should_propagate_errors()); statusbar.set_text(String::from_deprecated_string(app->description()).release_value_but_fixme_should_propagate_errors());
}; };
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));

6
Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp
View file

@ -18,10 +18,10 @@ ErrorOr<NonnullRefPtr<ProgressWindow>> ProgressWindow::try_create(StringView tit
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
main_widget->set_layout<GUI::VerticalBoxLayout>(); main_widget->set_layout<GUI::VerticalBoxLayout>();
auto label = TRY(main_widget->try_add<GUI::Label>("Analyzing storage space..."_string)); auto& label = main_widget->add<GUI::Label>("Analyzing storage space..."_string);
label->set_fixed_height(22); label.set_fixed_height(22);
window->m_progress_label = TRY(main_widget->try_add<GUI::Label>()); window->m_progress_label = main_widget->add<GUI::Label>();
window->m_progress_label->set_fixed_height(22); window->m_progress_label->set_fixed_height(22);
window->update_progress_label(0); window->update_progress_label(0);

2
Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp
View file

@ -19,7 +19,7 @@ ErrorOr<NonnullRefPtr<ProcessFileDescriptorMapWidget>> ProcessFileDescriptorMapW
{ {
auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessFileDescriptorMapWidget())); auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessFileDescriptorMapWidget()));
widget->set_layout<GUI::VerticalBoxLayout>(4); widget->set_layout<GUI::VerticalBoxLayout>(4);
widget->m_table_view = TRY(widget->try_add<GUI::TableView>()); widget->m_table_view = widget->add<GUI::TableView>();
Vector<GUI::JsonArrayModel::FieldSpec> pid_fds_fields; Vector<GUI::JsonArrayModel::FieldSpec> pid_fds_fields;
TRY(pid_fds_fields.try_empend("fd", "FD"_string, Gfx::TextAlignment::CenterRight)); TRY(pid_fds_fields.try_empend("fd", "FD"_string, Gfx::TextAlignment::CenterRight));

4
Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp
View file

@ -53,7 +53,7 @@ ErrorOr<NonnullRefPtr<ProcessMemoryMapWidget>> ProcessMemoryMapWidget::try_creat
{ {
auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessMemoryMapWidget())); auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessMemoryMapWidget()));
widget->set_layout<GUI::VerticalBoxLayout>(4); widget->set_layout<GUI::VerticalBoxLayout>(4);
widget->m_table_view = TRY(widget->try_add<GUI::TableView>()); widget->m_table_view = widget->add<GUI::TableView>();
Vector<GUI::JsonArrayModel::FieldSpec> pid_vm_fields; Vector<GUI::JsonArrayModel::FieldSpec> pid_vm_fields;
TRY(pid_vm_fields.try_empend( TRY(pid_vm_fields.try_empend(
@ -110,7 +110,7 @@ ErrorOr<NonnullRefPtr<ProcessMemoryMapWidget>> ProcessMemoryMapWidget::try_creat
widget->m_table_view->set_column_painting_delegate(7, TRY(try_make<PagemapPaintingDelegate>())); widget->m_table_view->set_column_painting_delegate(7, TRY(try_make<PagemapPaintingDelegate>()));
widget->m_table_view->set_key_column_and_sort_order(0, GUI::SortOrder::Ascending); widget->m_table_view->set_key_column_and_sort_order(0, GUI::SortOrder::Ascending);
widget->m_timer = TRY(widget->try_add<Core::Timer>(1000, [widget] { widget->refresh(); })); widget->m_timer = widget->add<Core::Timer>(1000, [widget] { widget->refresh(); });
widget->m_timer->start(); widget->m_timer->start();
return widget; return widget;

2
Userland/Applications/SystemMonitor/ProcessStateWidget.cpp
View file

@ -97,7 +97,7 @@ ErrorOr<NonnullRefPtr<ProcessStateWidget>> ProcessStateWidget::try_create()
{ {
auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessStateWidget())); auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessStateWidget()));
widget->set_layout<GUI::VerticalBoxLayout>(4); widget->set_layout<GUI::VerticalBoxLayout>(4);
widget->m_table_view = TRY(widget->try_add<GUI::TableView>()); widget->m_table_view = widget->add<GUI::TableView>();
widget->m_table_view->set_model(TRY(try_make_ref_counted<ProcessStateModel>(ProcessModel::the(), 0))); widget->m_table_view->set_model(TRY(try_make_ref_counted<ProcessStateModel>(ProcessModel::the(), 0)));
widget->m_table_view->column_header().set_visible(false); widget->m_table_view->column_header().set_visible(false);
widget->m_table_view->column_header().set_section_size(0, 90); widget->m_table_view->column_header().set_section_size(0, 90);

2
Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp
View file

@ -20,7 +20,7 @@ ErrorOr<NonnullRefPtr<ProcessUnveiledPathsWidget>> ProcessUnveiledPathsWidget::t
{ {
auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessUnveiledPathsWidget())); auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessUnveiledPathsWidget()));
widget->set_layout<GUI::VerticalBoxLayout>(4); widget->set_layout<GUI::VerticalBoxLayout>(4);
widget->m_table_view = TRY(widget->try_add<GUI::TableView>()); widget->m_table_view = widget->add<GUI::TableView>();
Vector<GUI::JsonArrayModel::FieldSpec> pid_unveil_fields; Vector<GUI::JsonArrayModel::FieldSpec> pid_unveil_fields;
TRY(pid_unveil_fields.try_empend("path", "Path"_string, Gfx::TextAlignment::CenterLeft)); TRY(pid_unveil_fields.try_empend("path", "Path"_string, Gfx::TextAlignment::CenterLeft));

2
Userland/Applications/SystemMonitor/ThreadStackWidget.cpp
View file

@ -75,7 +75,7 @@ ErrorOr<NonnullRefPtr<ThreadStackWidget>> ThreadStackWidget::try_create()
{ {
auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ThreadStackWidget())); auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ThreadStackWidget()));
widget->set_layout<GUI::VerticalBoxLayout>(4); widget->set_layout<GUI::VerticalBoxLayout>(4);
widget->m_stack_table = TRY(widget->try_add<GUI::TableView>()); widget->m_stack_table = widget->add<GUI::TableView>();
widget->m_stack_table->set_model(TRY(try_make_ref_counted<ThreadStackModel>())); widget->m_stack_table->set_model(TRY(try_make_ref_counted<ThreadStackModel>()));
return widget; return widget;
} }

40
Userland/Applications/SystemMonitor/main.cpp
View file

@ -332,8 +332,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
memory_stats_widget->refresh(); memory_stats_widget->refresh();
}; };
update_stats(); update_stats();
auto refresh_timer = TRY(window->try_add<Core::Timer>(frequency * 1000, move(update_stats))); auto& refresh_timer = window->add<Core::Timer>(frequency * 1000, move(update_stats));
refresh_timer->start(); refresh_timer.start();
auto selected_id = [&](ProcessModel::Column column) -> pid_t { auto selected_id = [&](ProcessModel::Column column) -> pid_t {
if (process_table_view.selection().is_empty()) if (process_table_view.selection().is_empty())
@ -454,7 +454,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto make_frequency_action = [&](int seconds) -> ErrorOr<void> { auto make_frequency_action = [&](int seconds) -> ErrorOr<void> {
auto action = GUI::Action::create_checkable(DeprecatedString::formatted("&{} Sec", seconds), [&refresh_timer, seconds](auto&) { auto action = GUI::Action::create_checkable(DeprecatedString::formatted("&{} Sec", seconds), [&refresh_timer, seconds](auto&) {
Config::write_i32("SystemMonitor"sv, "Monitor"sv, "Frequency"sv, seconds); Config::write_i32("SystemMonitor"sv, "Monitor"sv, "Frequency"sv, seconds);
refresh_timer->restart(seconds * 1000); refresh_timer.restart(seconds * 1000);
}); });
action->set_status_tip(TRY(String::formatted("Refresh every {} seconds", seconds))); action->set_status_tip(TRY(String::formatted("Refresh every {} seconds", seconds)));
action->set_checked(frequency == seconds); action->set_checked(frequency == seconds);
@ -578,24 +578,24 @@ ErrorOr<void> build_performance_tab(GUI::Widget& graphs_container)
Vector<SystemMonitor::GraphWidget&> cpu_graphs; Vector<SystemMonitor::GraphWidget&> cpu_graphs;
for (auto row = 0u; row < cpu_graph_rows; ++row) { for (auto row = 0u; row < cpu_graph_rows; ++row) {
auto cpu_graph_row = TRY(cpu_graph_group_box.try_add<GUI::Widget>()); auto& cpu_graph_row = cpu_graph_group_box.add<GUI::Widget>();
cpu_graph_row->set_layout<GUI::HorizontalBoxLayout>(6); cpu_graph_row.set_layout<GUI::HorizontalBoxLayout>(6);
cpu_graph_row->set_fixed_height(108); cpu_graph_row.set_fixed_height(108);
for (auto i = 0u; i < cpu_graphs_per_row; ++i) { for (auto i = 0u; i < cpu_graphs_per_row; ++i) {
auto cpu_graph = TRY(cpu_graph_row->try_add<SystemMonitor::GraphWidget>()); auto& cpu_graph = cpu_graph_row.add<SystemMonitor::GraphWidget>();
cpu_graph->set_max(100); cpu_graph.set_max(100);
cpu_graph->set_value_format(0, { cpu_graph.set_value_format(0, {
.graph_color_role = ColorRole::SyntaxPreprocessorStatement, .graph_color_role = ColorRole::SyntaxPreprocessorStatement,
.text_formatter = [](u64 value) { .text_formatter = [](u64 value) {
return DeprecatedString::formatted("Total: {}%", value); return DeprecatedString::formatted("Total: {}%", value);
}, },
}); });
cpu_graph->set_value_format(1, { cpu_graph.set_value_format(1, {
.graph_color_role = ColorRole::SyntaxPreprocessorValue, .graph_color_role = ColorRole::SyntaxPreprocessorValue,
.text_formatter = [](u64 value) { .text_formatter = [](u64 value) {
return DeprecatedString::formatted("Kernel: {}%", value); return DeprecatedString::formatted("Kernel: {}%", value);
}, },
}); });
cpu_graphs.append(cpu_graph); cpu_graphs.append(cpu_graph);
} }
} }

50
Userland/Applications/Terminal/main.cpp
View file

@ -169,53 +169,53 @@ static ErrorOr<NonnullRefPtr<GUI::Window>> create_find_window(VT::TerminalWidget
main_widget->set_background_role(ColorRole::Button); main_widget->set_background_role(ColorRole::Button);
main_widget->set_layout<GUI::VerticalBoxLayout>(4); main_widget->set_layout<GUI::VerticalBoxLayout>(4);
auto find = TRY(main_widget->try_add<GUI::Widget>()); auto& find = main_widget->add<GUI::Widget>();
find->set_layout<GUI::HorizontalBoxLayout>(4); find.set_layout<GUI::HorizontalBoxLayout>(4);
find->set_fixed_height(30); find.set_fixed_height(30);
auto find_textbox = TRY(find->try_add<GUI::TextBox>()); auto& find_textbox = find.add<GUI::TextBox>();
find_textbox->set_fixed_width(230); find_textbox.set_fixed_width(230);
find_textbox->set_focus(true); find_textbox.set_focus(true);
if (terminal.has_selection()) if (terminal.has_selection())
find_textbox->set_text(terminal.selected_text().replace("\n"sv, " "sv, ReplaceMode::All)); find_textbox.set_text(terminal.selected_text().replace("\n"sv, " "sv, ReplaceMode::All));
auto find_backwards = TRY(find->try_add<GUI::Button>()); auto& find_backwards = find.add<GUI::Button>();
find_backwards->set_fixed_width(25); find_backwards.set_fixed_width(25);
find_backwards->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png"sv))); find_backwards.set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png"sv)));
auto find_forwards = TRY(find->try_add<GUI::Button>()); auto& find_forwards = find.add<GUI::Button>();
find_forwards->set_fixed_width(25); find_forwards.set_fixed_width(25);
find_forwards->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/downward-triangle.png"sv))); find_forwards.set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/downward-triangle.png"sv)));
find_textbox->on_return_pressed = [find_backwards] { find_textbox.on_return_pressed = [&find_backwards] {
find_backwards->click(); find_backwards.click();
}; };
find_textbox->on_shift_return_pressed = [find_forwards] { find_textbox.on_shift_return_pressed = [&find_forwards] {
find_forwards->click(); find_forwards.click();
}; };
auto match_case = TRY(main_widget->try_add<GUI::CheckBox>("Case sensitive"_string)); auto& match_case = main_widget->add<GUI::CheckBox>("Case sensitive"_string);
auto wrap_around = TRY(main_widget->try_add<GUI::CheckBox>("Wrap around"_string)); auto& wrap_around = main_widget->add<GUI::CheckBox>("Wrap around"_string);
find_backwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) { find_backwards.on_click = [&terminal, &find_textbox, &match_case, &wrap_around](auto) {
auto needle = find_textbox->text(); auto needle = find_textbox.text();
if (needle.is_empty()) { if (needle.is_empty()) {
return; return;
} }
auto found_range = terminal.find_previous(needle, terminal.normalized_selection().start(), match_case->is_checked(), wrap_around->is_checked()); auto found_range = terminal.find_previous(needle, terminal.normalized_selection().start(), match_case.is_checked(), wrap_around.is_checked());
if (found_range.is_valid()) { if (found_range.is_valid()) {
terminal.scroll_to_row(found_range.start().row()); terminal.scroll_to_row(found_range.start().row());
terminal.set_selection(found_range); terminal.set_selection(found_range);
} }
}; };
find_forwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) { find_forwards.on_click = [&terminal, &find_textbox, &match_case, &wrap_around](auto) {
auto needle = find_textbox->text(); auto needle = find_textbox.text();
if (needle.is_empty()) { if (needle.is_empty()) {
return; return;
} }
auto found_range = terminal.find_next(needle, terminal.normalized_selection().end(), match_case->is_checked(), wrap_around->is_checked()); auto found_range = terminal.find_next(needle, terminal.normalized_selection().end(), match_case.is_checked(), wrap_around.is_checked());
if (found_range.is_valid()) { if (found_range.is_valid()) {
terminal.scroll_to_row(found_range.start().row()); terminal.scroll_to_row(found_range.start().row());

4
Userland/Applications/ThemeEditor/MainWidget.cpp
View file

@ -469,13 +469,13 @@ ErrorOr<void> MainWidget::add_property_tab(PropertyTab const& property_tab)
properties_list->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 8 }, 12); properties_list->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 8 }, 12);
for (auto const& group : property_tab.property_groups) { for (auto const& group : property_tab.property_groups) {
NonnullRefPtr<GUI::GroupBox> group_box = TRY(properties_list->try_add<GUI::GroupBox>(group.title)); NonnullRefPtr<GUI::GroupBox> group_box = properties_list->add<GUI::GroupBox>(group.title);
// 1px less on the left makes the text line up with the group title. // 1px less on the left makes the text line up with the group title.
group_box->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 8, 8, 8, 7 }, 12); group_box->set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 8, 8, 8, 7 }, 12);
group_box->set_preferred_height(GUI::SpecialDimension::Fit); group_box->set_preferred_height(GUI::SpecialDimension::Fit);
for (auto const& property : group.properties) { for (auto const& property : group.properties) {
NonnullRefPtr<GUI::Widget> row_widget = TRY(group_box->try_add<GUI::Widget>()); NonnullRefPtr<GUI::Widget> row_widget = group_box->add<GUI::Widget>();
row_widget->set_fixed_height(22); row_widget->set_fixed_height(22);
TRY(property.role.visit( TRY(property.role.visit(
[&](Gfx::AlignmentRole role) -> ErrorOr<void> { [&](Gfx::AlignmentRole role) -> ErrorOr<void> {

2
Userland/Demos/ModelGallery/GalleryWidget.cpp
View file

@ -15,7 +15,7 @@ GalleryWidget::GalleryWidget()
auto& inner_widget = add<GUI::Widget>(); auto& inner_widget = add<GUI::Widget>();
inner_widget.set_layout<GUI::VerticalBoxLayout>(4); inner_widget.set_layout<GUI::VerticalBoxLayout>(4);
m_tab_widget = inner_widget.try_add<GUI::TabWidget>().release_value_but_fixme_should_propagate_errors(); m_tab_widget = inner_widget.add<GUI::TabWidget>();
m_statusbar = add<GUI::Statusbar>(); m_statusbar = add<GUI::Statusbar>();
(void)load_basic_model_tab(); (void)load_basic_model_tab();

8
Userland/Demos/Screensaver/main.cpp
View file

@ -89,12 +89,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
main_widget->set_layout<GUI::VerticalBoxLayout>(); main_widget->set_layout<GUI::VerticalBoxLayout>();
auto icon_view = TRY(main_widget->try_add<GUI::IconView>()); auto& icon_view = main_widget->add<GUI::IconView>();
icon_view->set_should_hide_unnecessary_scrollbars(true); icon_view.set_should_hide_unnecessary_scrollbars(true);
auto model = adopt_ref(*new ScreensaverAppsModel); auto model = adopt_ref(*new ScreensaverAppsModel);
icon_view->set_model(*model); icon_view.set_model(*model);
icon_view->on_activation = [&](GUI::ModelIndex const& index) { icon_view.on_activation = [&](GUI::ModelIndex const& index) {
auto executable = model->data(index, GUI::ModelRole::Custom).as_string(); auto executable = model->data(index, GUI::ModelRole::Custom).as_string();
GUI::Process::spawn_or_show_error(window, executable); GUI::Process::spawn_or_show_error(window, executable);
}; };

130
Userland/DevTools/Profiler/main.cpp
View file

@ -109,9 +109,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
if (!matching_event_found) if (!matching_event_found)
continue; continue;
auto timeline_header = TRY(timeline_header_container->try_add<TimelineHeader>(*profile, process)); auto& timeline_header = timeline_header_container->add<TimelineHeader>(*profile, process);
timeline_header->set_shrink_to_fit(true); timeline_header.set_shrink_to_fit(true);
timeline_header->on_selection_change = [&](bool selected) { timeline_header.on_selection_change = [&](bool selected) {
auto end_valid = process.end_valid == EventSerialNumber {} ? EventSerialNumber::max_valid_serial() : process.end_valid; auto end_valid = process.end_valid == EventSerialNumber {} ? EventSerialNumber::max_valid_serial() : process.end_valid;
if (selected) if (selected)
profile->add_process_filter(process.pid, process.start_valid, end_valid); profile->add_process_filter(process.pid, process.start_valid, end_valid);
@ -124,96 +124,96 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}); });
}; };
(void)TRY(timeline_view->try_add<TimelineTrack>(*timeline_view, *profile, process)); timeline_view->add<TimelineTrack>(*timeline_view, *profile, process);
} }
auto main_splitter = TRY(main_widget->try_add<GUI::VerticalSplitter>()); auto& main_splitter = main_widget->add<GUI::VerticalSplitter>();
[[maybe_unused]] auto timeline_container = TRY(main_splitter->try_add<TimelineContainer>(*timeline_header_container, *timeline_view)); [[maybe_unused]] auto& timeline_container = main_splitter.add<TimelineContainer>(*timeline_header_container, *timeline_view);
auto tab_widget = TRY(main_splitter->try_add<GUI::TabWidget>()); auto& tab_widget = main_splitter.add<GUI::TabWidget>();
auto& tree_tab = tab_widget->add_tab<GUI::Widget>("Call Tree"_string); auto& tree_tab = tab_widget.add_tab<GUI::Widget>("Call Tree"_string);
tree_tab.set_layout<GUI::VerticalBoxLayout>(4); tree_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto bottom_splitter = TRY(tree_tab.try_add<GUI::VerticalSplitter>()); auto& bottom_splitter = tree_tab.add<GUI::VerticalSplitter>();
auto tree_view = TRY(bottom_splitter->try_add<GUI::TreeView>()); auto& tree_view = bottom_splitter.add<GUI::TreeView>();
tree_view->set_should_fill_selected_rows(true); tree_view.set_should_fill_selected_rows(true);
tree_view->set_column_headers_visible(true); tree_view.set_column_headers_visible(true);
tree_view->set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows); tree_view.set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows);
tree_view->set_model(profile->model()); tree_view.set_model(profile->model());
auto disassembly_view = TRY(bottom_splitter->try_add<GUI::TableView>()); auto& disassembly_view = bottom_splitter.add<GUI::TableView>();
disassembly_view->set_visible(false); disassembly_view.set_visible(false);
auto update_disassembly_model = [&] { auto update_disassembly_model = [&] {
if (disassembly_view->is_visible() && !tree_view->selection().is_empty()) { if (disassembly_view.is_visible() && !tree_view.selection().is_empty()) {
profile->set_disassembly_index(tree_view->selection().first()); profile->set_disassembly_index(tree_view.selection().first());
disassembly_view->set_model(profile->disassembly_model()); disassembly_view.set_model(profile->disassembly_model());
} else { } else {
disassembly_view->set_model(nullptr); disassembly_view.set_model(nullptr);
} }
}; };
auto source_view = TRY(bottom_splitter->try_add<GUI::TableView>()); auto& source_view = bottom_splitter.add<GUI::TableView>();
source_view->set_visible(false); source_view.set_visible(false);
auto update_source_model = [&] { auto update_source_model = [&] {
if (source_view->is_visible() && !tree_view->selection().is_empty()) { if (source_view.is_visible() && !tree_view.selection().is_empty()) {
profile->set_source_index(tree_view->selection().first()); profile->set_source_index(tree_view.selection().first());
source_view->set_model(profile->source_model()); source_view.set_model(profile->source_model());
} else { } else {
source_view->set_model(nullptr); source_view.set_model(nullptr);
} }
}; };
tree_view->on_selection_change = [&] { tree_view.on_selection_change = [&] {
update_disassembly_model(); update_disassembly_model();
update_source_model(); update_source_model();
}; };
auto disassembly_action = GUI::Action::create_checkable("Show &Disassembly", { Mod_Ctrl, Key_D }, Gfx::Bitmap::load_from_file("/res/icons/16x16/x86.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto& action) { auto disassembly_action = GUI::Action::create_checkable("Show &Disassembly", { Mod_Ctrl, Key_D }, Gfx::Bitmap::load_from_file("/res/icons/16x16/x86.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto& action) {
disassembly_view->set_visible(action.is_checked()); disassembly_view.set_visible(action.is_checked());
update_disassembly_model(); update_disassembly_model();
}); });
auto source_action = GUI::Action::create_checkable("Show &Source", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/x86.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto& action) { auto source_action = GUI::Action::create_checkable("Show &Source", { Mod_Ctrl, Key_S }, Gfx::Bitmap::load_from_file("/res/icons/16x16/x86.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto& action) {
source_view->set_visible(action.is_checked()); source_view.set_visible(action.is_checked());
update_source_model(); update_source_model();
}); });
auto& samples_tab = tab_widget->add_tab<GUI::Widget>("Samples"_string); auto& samples_tab = tab_widget.add_tab<GUI::Widget>("Samples"_string);
samples_tab.set_layout<GUI::VerticalBoxLayout>(4); samples_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto samples_splitter = TRY(samples_tab.try_add<GUI::HorizontalSplitter>()); auto& samples_splitter = samples_tab.add<GUI::HorizontalSplitter>();
auto samples_table_view = TRY(samples_splitter->try_add<GUI::TableView>()); auto& samples_table_view = samples_splitter.add<GUI::TableView>();
samples_table_view->set_model(profile->samples_model()); samples_table_view.set_model(profile->samples_model());
auto individual_sample_view = TRY(samples_splitter->try_add<GUI::TableView>()); auto& individual_sample_view = samples_splitter.add<GUI::TableView>();
samples_table_view->on_selection_change = [&] { samples_table_view.on_selection_change = [&] {
auto const& index = samples_table_view->selection().first(); auto const& index = samples_table_view.selection().first();
auto model = IndividualSampleModel::create(*profile, index.data(GUI::ModelRole::Custom).to_integer<size_t>()); auto model = IndividualSampleModel::create(*profile, index.data(GUI::ModelRole::Custom).to_integer<size_t>());
individual_sample_view->set_model(move(model)); individual_sample_view.set_model(move(model));
}; };
auto& signposts_tab = tab_widget->add_tab<GUI::Widget>("Signposts"_string); auto& signposts_tab = tab_widget.add_tab<GUI::Widget>("Signposts"_string);
signposts_tab.set_layout<GUI::VerticalBoxLayout>(4); signposts_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto signposts_splitter = TRY(signposts_tab.try_add<GUI::HorizontalSplitter>()); auto& signposts_splitter = signposts_tab.add<GUI::HorizontalSplitter>();
auto signposts_table_view = TRY(signposts_splitter->try_add<GUI::TableView>()); auto& signposts_table_view = signposts_splitter.add<GUI::TableView>();
signposts_table_view->set_model(profile->signposts_model()); signposts_table_view.set_model(profile->signposts_model());
auto individual_signpost_view = TRY(signposts_splitter->try_add<GUI::TableView>()); auto& individual_signpost_view = signposts_splitter.add<GUI::TableView>();
signposts_table_view->on_selection_change = [&] { signposts_table_view.on_selection_change = [&] {
auto const& index = signposts_table_view->selection().first(); auto const& index = signposts_table_view.selection().first();
auto model = IndividualSampleModel::create(*profile, index.data(GUI::ModelRole::Custom).to_integer<size_t>()); auto model = IndividualSampleModel::create(*profile, index.data(GUI::ModelRole::Custom).to_integer<size_t>());
individual_signpost_view->set_model(move(model)); individual_signpost_view.set_model(move(model));
}; };
auto& flamegraph_tab = tab_widget->add_tab<GUI::Widget>("Flame Graph"_string); auto& flamegraph_tab = tab_widget.add_tab<GUI::Widget>("Flame Graph"_string);
flamegraph_tab.set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 4, 4, 4 }); flamegraph_tab.set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 4, 4, 4 });
auto flamegraph_view = TRY(flamegraph_tab.try_add<FlameGraphView>(profile->model(), ProfileModel::Column::StackFrame, ProfileModel::Column::SampleCount)); auto& flamegraph_view = flamegraph_tab.add<FlameGraphView>(profile->model(), ProfileModel::Column::StackFrame, ProfileModel::Column::SampleCount);
u64 const start_of_trace = profile->first_timestamp(); u64 const start_of_trace = profile->first_timestamp();
u64 const end_of_trace = start_of_trace + profile->length_in_ms(); u64 const end_of_trace = start_of_trace + profile->length_in_ms();
@ -228,12 +228,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return DeprecatedString::formatted("{} Samples", sample_count.to_i32()); return DeprecatedString::formatted("{} Samples", sample_count.to_i32());
}; };
auto statusbar = TRY(main_widget->try_add<GUI::Statusbar>()); auto& statusbar = main_widget->add<GUI::Statusbar>();
auto statusbar_update = [&] { auto statusbar_update = [&] {
auto& view = *timeline_view; auto& view = *timeline_view;
StringBuilder builder; StringBuilder builder;
auto flamegraph_hovered_index = flamegraph_view->hovered_index(); auto flamegraph_hovered_index = flamegraph_view.hovered_index();
if (flamegraph_hovered_index.is_valid()) { if (flamegraph_hovered_index.is_valid()) {
auto stack = profile->model().data(flamegraph_hovered_index.sibling_at_column(ProfileModel::Column::StackFrame)).to_deprecated_string(); auto stack = profile->model().data(flamegraph_hovered_index.sibling_at_column(ProfileModel::Column::StackFrame)).to_deprecated_string();
auto sample_count = profile->model().data(flamegraph_hovered_index.sibling_at_column(ProfileModel::Column::SampleCount)); auto sample_count = profile->model().data(flamegraph_hovered_index.sibling_at_column(ProfileModel::Column::SampleCount));
@ -253,24 +253,24 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
builder.appendff(", Duration: {} ms", end - start); builder.appendff(", Duration: {} ms", end - start);
} }
} }
statusbar->set_text(builder.to_string().release_value_but_fixme_should_propagate_errors()); statusbar.set_text(builder.to_string().release_value_but_fixme_should_propagate_errors());
}; };
timeline_view->on_selection_change = [&] { statusbar_update(); }; timeline_view->on_selection_change = [&] { statusbar_update(); };
flamegraph_view->on_hover_change = [&] { statusbar_update(); }; flamegraph_view.on_hover_change = [&] { statusbar_update(); };
auto& filesystem_events_tab = tab_widget->add_tab<GUI::Widget>("Filesystem events"_string); auto& filesystem_events_tab = tab_widget.add_tab<GUI::Widget>("Filesystem events"_string);
filesystem_events_tab.set_layout<GUI::VerticalBoxLayout>(4); filesystem_events_tab.set_layout<GUI::VerticalBoxLayout>(4);
auto filesystem_events_tree_view = TRY(filesystem_events_tab.try_add<GUI::TreeView>()); auto& filesystem_events_tree_view = filesystem_events_tab.add<GUI::TreeView>();
filesystem_events_tree_view->set_should_fill_selected_rows(true); filesystem_events_tree_view.set_should_fill_selected_rows(true);
filesystem_events_tree_view->set_column_headers_visible(true); filesystem_events_tree_view.set_column_headers_visible(true);
filesystem_events_tree_view->set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows); filesystem_events_tree_view.set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows);
filesystem_events_tree_view->set_model(profile->file_event_model()); filesystem_events_tree_view.set_model(profile->file_event_model());
filesystem_events_tree_view->set_column_visible(FileEventModel::Column::OpenDuration, false); filesystem_events_tree_view.set_column_visible(FileEventModel::Column::OpenDuration, false);
filesystem_events_tree_view->set_column_visible(FileEventModel::Column::CloseDuration, false); filesystem_events_tree_view.set_column_visible(FileEventModel::Column::CloseDuration, false);
filesystem_events_tree_view->set_column_visible(FileEventModel::Column::ReadvDuration, false); filesystem_events_tree_view.set_column_visible(FileEventModel::Column::ReadvDuration, false);
filesystem_events_tree_view->set_column_visible(FileEventModel::Column::ReadDuration, false); filesystem_events_tree_view.set_column_visible(FileEventModel::Column::ReadDuration, false);
filesystem_events_tree_view->set_column_visible(FileEventModel::Column::PreadDuration, false); filesystem_events_tree_view.set_column_visible(FileEventModel::Column::PreadDuration, false);
auto file_menu = window->add_menu("&File"_string); auto file_menu = window->add_menu("&File"_string);
file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); }));
@ -291,9 +291,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto percent_action = GUI::Action::create_checkable("Show &Percentages", { Mod_Ctrl, Key_P }, [&](auto& action) { auto percent_action = GUI::Action::create_checkable("Show &Percentages", { Mod_Ctrl, Key_P }, [&](auto& action) {
profile->set_show_percentages(action.is_checked()); profile->set_show_percentages(action.is_checked());
tree_view->update(); tree_view.update();
disassembly_view->update(); disassembly_view.update();
source_view->update(); source_view.update();
}); });
percent_action->set_checked(false); percent_action->set_checked(false);
view_menu->add_action(percent_action); view_menu->add_action(percent_action);

58
Userland/Games/GameOfLife/main.cpp
View file

@ -61,12 +61,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& board_widget_container = *main_widget->find_descendant_of_type_named<GUI::Widget>("board_widget_container"); auto& board_widget_container = *main_widget->find_descendant_of_type_named<GUI::Widget>("board_widget_container");
board_widget_container.set_layout<GUI::VerticalBoxLayout>(GUI::Margins {}, 0); board_widget_container.set_layout<GUI::VerticalBoxLayout>(GUI::Margins {}, 0);
auto board_widget = TRY(board_widget_container.try_add<BoardWidget>(board_rows, board_columns)); auto& board_widget = board_widget_container.add<BoardWidget>(board_rows, board_columns);
board_widget->randomize_cells(); board_widget.randomize_cells();
board_widget->set_min_size(board_columns, board_rows); board_widget.set_min_size(board_columns, board_rows);
auto& statusbar = *main_widget->find_descendant_of_type_named<GUI::Statusbar>("statusbar"); auto& statusbar = *main_widget->find_descendant_of_type_named<GUI::Statusbar>("statusbar");
auto width = board_widget->font().width("Ticks: 000,000,000"sv) + board_widget->font().max_glyph_width(); auto width = board_widget.font().width("Ticks: 000,000,000"sv) + board_widget.font().max_glyph_width();
statusbar.segment(1).set_fixed_width(ceil(width)); statusbar.segment(1).set_fixed_width(ceil(width));
statusbar.segment(0).set_text(click_tip); statusbar.segment(0).set_text(click_tip);
@ -78,8 +78,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto size_changed_function = [&] { auto size_changed_function = [&] {
statusbar.segment(0).set_text(click_tip); statusbar.segment(0).set_text(click_tip);
board_widget->resize_board(rows_spinbox.value(), columns_spinbox.value()); board_widget.resize_board(rows_spinbox.value(), columns_spinbox.value());
board_widget->update(); board_widget.update();
}; };
rows_spinbox.on_change = [&](auto) { size_changed_function(); }; rows_spinbox.on_change = [&](auto) { size_changed_function(); };
@ -88,7 +88,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& interval_spinbox = *main_widget->find_descendant_of_type_named<GUI::SpinBox>("interval_spinbox"); auto& interval_spinbox = *main_widget->find_descendant_of_type_named<GUI::SpinBox>("interval_spinbox");
interval_spinbox.on_change = [&](auto value) { interval_spinbox.on_change = [&](auto value) {
board_widget->set_running_timer_interval(value); board_widget.set_running_timer_interval(value);
}; };
interval_spinbox.set_value(150); interval_spinbox.set_value(150);
@ -97,35 +97,35 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto play_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/play.png"sv)); auto play_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/play.png"sv));
auto play_pause_action = GUI::Action::create("&Play", { Mod_None, Key_Return }, *play_icon, [&](GUI::Action&) { auto play_pause_action = GUI::Action::create("&Play", { Mod_None, Key_Return }, *play_icon, [&](GUI::Action&) {
board_widget->set_running(!board_widget->is_running()); board_widget.set_running(!board_widget.is_running());
}); });
main_toolbar.add_action(play_pause_action); main_toolbar.add_action(play_pause_action);
auto run_one_generation_action = GUI::Action::create("Run &Next Generation", { Mod_Ctrl, Key_Equal }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [&](const GUI::Action&) { auto run_one_generation_action = GUI::Action::create("Run &Next Generation", { Mod_Ctrl, Key_Equal }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [&](const GUI::Action&) {
statusbar.segment(0).set_text(click_tip); statusbar.segment(0).set_text(click_tip);
board_widget->run_generation(); board_widget.run_generation();
}); });
main_toolbar.add_action(run_one_generation_action); main_toolbar.add_action(run_one_generation_action);
auto clear_board_action = GUI::Action::create("&Clear board", { Mod_Ctrl, Key_N }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"sv)), [&](auto&) { auto clear_board_action = GUI::Action::create("&Clear board", { Mod_Ctrl, Key_N }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/delete.png"sv)), [&](auto&) {
statusbar.segment(0).set_text(click_tip); statusbar.segment(0).set_text(click_tip);
statusbar.segment(1).set_text({}); statusbar.segment(1).set_text({});
board_widget->clear_cells(); board_widget.clear_cells();
board_widget->update(); board_widget.update();
}); });
main_toolbar.add_action(clear_board_action); main_toolbar.add_action(clear_board_action);
auto randomize_cells_action = GUI::Action::create("&Randomize board", { Mod_Ctrl, Key_R }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) { auto randomize_cells_action = GUI::Action::create("&Randomize board", { Mod_Ctrl, Key_R }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/reload.png"sv)), [&](auto&) {
statusbar.segment(0).set_text(click_tip); statusbar.segment(0).set_text(click_tip);
statusbar.segment(1).set_text({}); statusbar.segment(1).set_text({});
board_widget->randomize_cells(); board_widget.randomize_cells();
board_widget->update(); board_widget.update();
}); });
main_toolbar.add_action(randomize_cells_action); main_toolbar.add_action(randomize_cells_action);
auto rotate_pattern_action = GUI::Action::create("&Rotate pattern", { 0, Key_R }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/redo.png"sv)), [&](auto&) { auto rotate_pattern_action = GUI::Action::create("&Rotate pattern", { 0, Key_R }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/redo.png"sv)), [&](auto&) {
board_widget->selected_pattern()->rotate_clockwise(); board_widget.selected_pattern()->rotate_clockwise();
}); });
rotate_pattern_action->set_enabled(false); rotate_pattern_action->set_enabled(false);
main_toolbar.add_action(rotate_pattern_action); main_toolbar.add_action(rotate_pattern_action);
@ -149,12 +149,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
})); }));
help_menu->add_action(GUI::CommonActions::make_about_action("Game of Life"_string, app_icon, window)); help_menu->add_action(GUI::CommonActions::make_about_action("Game of Life"_string, app_icon, window));
board_widget->on_tick = [&](u64 ticks) { board_widget.on_tick = [&](u64 ticks) {
statusbar.segment(1).set_text(String::formatted("Ticks: {:'}", ticks).release_value_but_fixme_should_propagate_errors()); statusbar.segment(1).set_text(String::formatted("Ticks: {:'}", ticks).release_value_but_fixme_should_propagate_errors());
}; };
board_widget->on_running_state_change = [&]() { board_widget.on_running_state_change = [&]() {
if (board_widget->is_running()) { if (board_widget.is_running()) {
statusbar.segment(0).set_text("Running..."_string); statusbar.segment(0).set_text("Running..."_string);
play_pause_action->set_icon(paused_icon); play_pause_action->set_icon(paused_icon);
play_pause_action->set_text("&Pause"); play_pause_action->set_text("&Pause");
@ -166,31 +166,31 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
main_widget->set_override_cursor(Gfx::StandardCursor::Drag); main_widget->set_override_cursor(Gfx::StandardCursor::Drag);
} }
interval_spinbox.set_value(board_widget->running_timer_interval()); interval_spinbox.set_value(board_widget.running_timer_interval());
rows_spinbox.set_enabled(!board_widget->is_running()); rows_spinbox.set_enabled(!board_widget.is_running());
columns_spinbox.set_enabled(!board_widget->is_running()); columns_spinbox.set_enabled(!board_widget.is_running());
interval_spinbox.set_enabled(!board_widget->is_running()); interval_spinbox.set_enabled(!board_widget.is_running());
run_one_generation_action->set_enabled(!board_widget->is_running()); run_one_generation_action->set_enabled(!board_widget.is_running());
clear_board_action->set_enabled(!board_widget->is_running()); clear_board_action->set_enabled(!board_widget.is_running());
randomize_cells_action->set_enabled(!board_widget->is_running()); randomize_cells_action->set_enabled(!board_widget.is_running());
board_widget->update(); board_widget.update();
}; };
board_widget->on_stall = [&] { board_widget.on_stall = [&] {
play_pause_action->activate(); play_pause_action->activate();
statusbar.segment(0).set_text("Stalled"_string); statusbar.segment(0).set_text("Stalled"_string);
}; };
board_widget->on_cell_toggled = [&](auto, auto, auto) { board_widget.on_cell_toggled = [&](auto, auto, auto) {
statusbar.segment(0).set_text(click_tip); statusbar.segment(0).set_text(click_tip);
statusbar.segment(1).set_text({}); statusbar.segment(1).set_text({});
}; };
board_widget->on_pattern_selection_state_change = [&] { board_widget.on_pattern_selection_state_change = [&] {
rotate_pattern_action->set_enabled(board_widget->selected_pattern() != nullptr); rotate_pattern_action->set_enabled(board_widget.selected_pattern() != nullptr);
}; };
window->resize(600, 500); window->resize(600, 500);

32
Userland/Libraries/LibGUI/InputBox.cpp
View file

@ -132,13 +132,13 @@ ErrorOr<void> InputBox::build()
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
if (!m_prompt.is_empty()) { if (!m_prompt.is_empty()) {
auto prompt_container = TRY(main_widget->try_add<Widget>()); auto& prompt_container = main_widget->add<Widget>();
prompt_container->set_layout<HorizontalBoxLayout>(0, 8); prompt_container.set_layout<HorizontalBoxLayout>(0, 8);
if (m_icon) { if (m_icon) {
auto image_widget = TRY(prompt_container->try_add<ImageWidget>()); auto& image_widget = prompt_container.add<ImageWidget>();
image_widget->set_bitmap(m_icon); image_widget.set_bitmap(m_icon);
} }
m_prompt_label = TRY(prompt_container->try_add<Label>()); m_prompt_label = prompt_container.add<Label>();
m_prompt_label->set_autosize(true); m_prompt_label->set_autosize(true);
m_prompt_label->set_text_wrapping(Gfx::TextWrapping::DontWrap); m_prompt_label->set_text_wrapping(Gfx::TextWrapping::DontWrap);
m_prompt_label->set_text(m_prompt); m_prompt_label->set_text(m_prompt);
@ -147,21 +147,21 @@ ErrorOr<void> InputBox::build()
switch (m_input_type) { switch (m_input_type) {
case InputType::Text: case InputType::Text:
case InputType::NonemptyText: case InputType::NonemptyText:
m_text_editor = TRY(main_widget->try_add<TextBox>()); m_text_editor = main_widget->add<TextBox>();
break; break;
case InputType::Password: case InputType::Password:
m_text_editor = TRY(main_widget->try_add<PasswordBox>()); m_text_editor = main_widget->add<PasswordBox>();
break; break;
case InputType::Numeric: case InputType::Numeric:
m_spinbox = TRY(main_widget->try_add<SpinBox>()); m_spinbox = main_widget->add<SpinBox>();
break; break;
} }
auto button_container = TRY(main_widget->try_add<Widget>()); auto& button_container = main_widget->add<Widget>();
button_container->set_layout<HorizontalBoxLayout>(0, 6); button_container.set_layout<HorizontalBoxLayout>(0, 6);
button_container->add_spacer(); button_container.add_spacer();
m_ok_button = TRY(button_container->try_add<DialogButton>("OK"_string)); m_ok_button = button_container.add<DialogButton>("OK"_string);
m_ok_button->on_click = [this](auto) { m_ok_button->on_click = [this](auto) {
if (m_spinbox) if (m_spinbox)
m_spinbox->set_value_from_current_text(); m_spinbox->set_value_from_current_text();
@ -169,15 +169,15 @@ ErrorOr<void> InputBox::build()
}; };
m_ok_button->set_default(true); m_ok_button->set_default(true);
m_cancel_button = TRY(button_container->try_add<DialogButton>("Cancel"_string)); m_cancel_button = button_container.add<DialogButton>("Cancel"_string);
m_cancel_button->on_click = [this](auto) { done(ExecResult::Cancel); }; m_cancel_button->on_click = [this](auto) { done(ExecResult::Cancel); };
auto guarantee_width = [this, button_container] { auto guarantee_width = [this, &button_container] {
if (m_prompt.is_empty()) if (m_prompt.is_empty())
return; return;
auto width = button_container->calculated_min_size().value().width().as_int(); auto width = button_container.calculated_min_size().value().width().as_int();
auto constexpr golden_ratio = 1.618; auto constexpr golden_ratio = 1.618;
button_container->set_min_width(width * golden_ratio); button_container.set_min_width(width * golden_ratio);
}; };
guarantee_width(); guarantee_width();
on_font_change = [guarantee_width] { guarantee_width(); }; on_font_change = [guarantee_width] { guarantee_width(); };

34
Userland/Libraries/LibGUI/MessageBox.cpp
View file

@ -154,41 +154,41 @@ ErrorOr<void> MessageBox::build()
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
main_widget->set_layout<VerticalBoxLayout>(8, 6); main_widget->set_layout<VerticalBoxLayout>(8, 6);
auto message_container = TRY(main_widget->try_add<Widget>()); auto& message_container = main_widget->add<Widget>();
auto message_margins = Margins { 8, m_type != Type::None ? 8 : 0 }; auto message_margins = Margins { 8, m_type != Type::None ? 8 : 0 };
message_container->set_layout<HorizontalBoxLayout>(message_margins, 8); message_container.set_layout<HorizontalBoxLayout>(message_margins, 8);
if (auto icon = TRY(this->icon()); icon && m_type != Type::None) { if (auto icon = TRY(this->icon()); icon && m_type != Type::None) {
auto image_widget = TRY(message_container->try_add<ImageWidget>()); auto& image_widget = message_container.add<ImageWidget>();
image_widget->set_bitmap(icon); image_widget.set_bitmap(icon);
} }
m_text_label = TRY(message_container->try_add<Label>()); m_text_label = message_container.add<Label>();
m_text_label->set_text_wrapping(Gfx::TextWrapping::DontWrap); m_text_label->set_text_wrapping(Gfx::TextWrapping::DontWrap);
m_text_label->set_autosize(true); m_text_label->set_autosize(true);
if (m_type != Type::None) if (m_type != Type::None)
m_text_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); m_text_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto button_container = TRY(main_widget->try_add<Widget>()); auto& button_container = main_widget->add<Widget>();
button_container->set_layout<HorizontalBoxLayout>(Margins {}, 8); button_container.set_layout<HorizontalBoxLayout>(Margins {}, 8);
auto add_button = [&](String text, ExecResult result) -> ErrorOr<NonnullRefPtr<Button>> { auto add_button = [&](String text, ExecResult result) -> NonnullRefPtr<Button> {
auto button = TRY(button_container->try_add<DialogButton>()); auto& button = button_container.add<DialogButton>();
button->set_text(move(text)); button.set_text(move(text));
button->on_click = [this, result](auto) { done(result); }; button.on_click = [this, result](auto) { done(result); };
return button; return button;
}; };
button_container->add_spacer(); button_container.add_spacer();
if (should_include_ok_button()) if (should_include_ok_button())
m_ok_button = TRY(add_button("OK"_string, ExecResult::OK)); m_ok_button = add_button("OK"_string, ExecResult::OK);
if (should_include_yes_button()) if (should_include_yes_button())
m_yes_button = TRY(add_button("Yes"_string, ExecResult::Yes)); m_yes_button = add_button("Yes"_string, ExecResult::Yes);
if (should_include_no_button()) if (should_include_no_button())
m_no_button = TRY(add_button("No"_string, ExecResult::No)); m_no_button = add_button("No"_string, ExecResult::No);
if (should_include_cancel_button()) if (should_include_cancel_button())
m_cancel_button = TRY(add_button("Cancel"_string, ExecResult::Cancel)); m_cancel_button = add_button("Cancel"_string, ExecResult::Cancel);
button_container->add_spacer(); button_container.add_spacer();
return {}; return {};
} }

18
Userland/Libraries/LibGUI/SettingsWindow.cpp
View file

@ -36,34 +36,34 @@ ErrorOr<NonnullRefPtr<SettingsWindow>> SettingsWindow::create(DeprecatedString t
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
main_widget->set_layout<GUI::VerticalBoxLayout>(4, 6); main_widget->set_layout<GUI::VerticalBoxLayout>(4, 6);
window->m_tab_widget = TRY(main_widget->try_add<GUI::TabWidget>()); window->m_tab_widget = main_widget->add<GUI::TabWidget>();
auto button_container = TRY(main_widget->try_add<GUI::Widget>()); auto& button_container = main_widget->add<GUI::Widget>();
button_container->set_preferred_size({ SpecialDimension::Grow, SpecialDimension::Fit }); button_container.set_preferred_size({ SpecialDimension::Grow, SpecialDimension::Fit });
button_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 6); button_container.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 6);
if (show_defaults_button == ShowDefaultsButton::Yes) { if (show_defaults_button == ShowDefaultsButton::Yes) {
window->m_reset_button = TRY(button_container->try_add<GUI::DialogButton>("Defaults"_string)); window->m_reset_button = button_container.add<GUI::DialogButton>("Defaults"_string);
window->m_reset_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) { window->m_reset_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) {
window->reset_default_values(); window->reset_default_values();
}; };
} }
button_container->add_spacer(); button_container.add_spacer();
window->m_ok_button = TRY(button_container->try_add<GUI::DialogButton>("OK"_string)); window->m_ok_button = button_container.add<GUI::DialogButton>("OK"_string);
window->m_ok_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) { window->m_ok_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) {
window->apply_settings(); window->apply_settings();
GUI::Application::the()->quit(); GUI::Application::the()->quit();
}; };
window->m_cancel_button = TRY(button_container->try_add<GUI::DialogButton>("Cancel"_string)); window->m_cancel_button = button_container.add<GUI::DialogButton>("Cancel"_string);
window->m_cancel_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) { window->m_cancel_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) {
window->cancel_settings(); window->cancel_settings();
GUI::Application::the()->quit(); GUI::Application::the()->quit();
}; };
window->m_apply_button = TRY(button_container->try_add<GUI::DialogButton>("Apply"_string)); window->m_apply_button = button_container.add<GUI::DialogButton>("Apply"_string);
window->m_apply_button->set_enabled(false); window->m_apply_button->set_enabled(false);
window->m_apply_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) { window->m_apply_button->on_click = [window = window->make_weak_ptr<SettingsWindow>()](auto) {
window->apply_settings(); window->apply_settings();

8
Userland/Libraries/LibGUI/Wizards/CoverWizardPage.cpp
View file

@ -25,19 +25,19 @@ ErrorOr<void> CoverWizardPage::build(String title, String subtitle)
set_fill_with_background_color(true); set_fill_with_background_color(true);
set_background_role(Gfx::ColorRole::Base); set_background_role(Gfx::ColorRole::Base);
set_layout<HorizontalBoxLayout>(); set_layout<HorizontalBoxLayout>();
m_banner_image_widget = TRY(try_add<ImageWidget>()); m_banner_image_widget = add<ImageWidget>();
m_banner_image_widget->set_fixed_size(160, 315); m_banner_image_widget->set_fixed_size(160, 315);
m_banner_image_widget->load_from_file("/res/graphics/wizard-banner-simple.png"sv); m_banner_image_widget->load_from_file("/res/graphics/wizard-banner-simple.png"sv);
m_content_widget = TRY(try_add<Widget>()); m_content_widget = add<Widget>();
m_content_widget->set_layout<VerticalBoxLayout>(20); m_content_widget->set_layout<VerticalBoxLayout>(20);
m_header_label = TRY(m_content_widget->try_add<Label>(move(title))); m_header_label = m_content_widget->add<Label>(move(title));
m_header_label->set_font(Gfx::FontDatabase::the().get("Pebbleton"_fly_string, 14, 700, Gfx::FontWidth::Normal, 0)); m_header_label->set_font(Gfx::FontDatabase::the().get("Pebbleton"_fly_string, 14, 700, Gfx::FontWidth::Normal, 0));
m_header_label->set_text_alignment(Gfx::TextAlignment::TopLeft); m_header_label->set_text_alignment(Gfx::TextAlignment::TopLeft);
m_header_label->set_fixed_height(48); m_header_label->set_fixed_height(48);
m_body_label = TRY(m_content_widget->try_add<Label>(move(subtitle))); m_body_label = m_content_widget->add<Label>(move(subtitle));
m_body_label->set_text_alignment(Gfx::TextAlignment::TopLeft); m_body_label->set_text_alignment(Gfx::TextAlignment::TopLeft);
return {}; return {};

24
Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp
View file

@ -29,24 +29,24 @@ ErrorOr<void> WizardDialog::build()
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
main_widget->set_layout<VerticalBoxLayout>(Margins {}, 0); main_widget->set_layout<VerticalBoxLayout>(Margins {}, 0);
m_page_container_widget = TRY(main_widget->try_add<Widget>()); m_page_container_widget = main_widget->add<Widget>();
m_page_container_widget->set_fixed_size(500, 315); m_page_container_widget->set_fixed_size(500, 315);
m_page_container_widget->set_layout<VerticalBoxLayout>(); m_page_container_widget->set_layout<VerticalBoxLayout>();
auto separator = TRY(main_widget->try_add<SeparatorWidget>(Gfx::Orientation::Horizontal)); auto& separator = main_widget->add<SeparatorWidget>(Gfx::Orientation::Horizontal);
separator->set_fixed_height(2); separator.set_fixed_height(2);
auto nav_container_widget = TRY(main_widget->try_add<Widget>()); auto& nav_container_widget = main_widget->add<Widget>();
nav_container_widget->set_layout<HorizontalBoxLayout>(Margins { 0, 10 }, 0); nav_container_widget.set_layout<HorizontalBoxLayout>(Margins { 0, 10 }, 0);
nav_container_widget->set_fixed_height(42); nav_container_widget.set_fixed_height(42);
nav_container_widget->add_spacer(); nav_container_widget.add_spacer();
m_back_button = TRY(nav_container_widget->try_add<DialogButton>("< Back"_string)); m_back_button = nav_container_widget.add<DialogButton>("< Back"_string);
m_back_button->on_click = [&](auto) { m_back_button->on_click = [&](auto) {
pop_page(); pop_page();
}; };
m_next_button = TRY(nav_container_widget->try_add<DialogButton>("Next >"_string)); m_next_button = nav_container_widget.add<DialogButton>("Next >"_string);
m_next_button->on_click = [&](auto) { m_next_button->on_click = [&](auto) {
VERIFY(has_pages()); VERIFY(has_pages());
@ -60,10 +60,10 @@ ErrorOr<void> WizardDialog::build()
push_page(*next_page); push_page(*next_page);
}; };
auto button_spacer = TRY(nav_container_widget->try_add<Widget>()); auto& button_spacer = nav_container_widget.add<Widget>();
button_spacer->set_fixed_width(10); button_spacer.set_fixed_width(10);
m_cancel_button = TRY(nav_container_widget->try_add<DialogButton>("Cancel"_string)); m_cancel_button = nav_container_widget.add<DialogButton>("Cancel"_string);
m_cancel_button->on_click = [&](auto) { m_cancel_button->on_click = [&](auto) {
handle_cancel(); handle_cancel();
}; };

22
Userland/Libraries/LibGUI/Wizards/WizardPage.cpp
View file

@ -25,26 +25,26 @@ ErrorOr<void> WizardPage::build(String title, String subtitle)
{ {
set_layout<VerticalBoxLayout>(Margins {}, 0); set_layout<VerticalBoxLayout>(Margins {}, 0);
auto header_widget = TRY(try_add<Widget>()); auto& header_widget = add<Widget>();
header_widget->set_fill_with_background_color(true); header_widget.set_fill_with_background_color(true);
header_widget->set_background_role(Gfx::ColorRole::Base); header_widget.set_background_role(Gfx::ColorRole::Base);
header_widget->set_fixed_height(58); header_widget.set_fixed_height(58);
header_widget->set_layout<VerticalBoxLayout>(Margins { 15, 30, 0 }); header_widget.set_layout<VerticalBoxLayout>(Margins { 15, 30, 0 });
m_title_label = TRY(header_widget->try_add<Label>(move(title))); m_title_label = header_widget.add<Label>(move(title));
m_title_label->set_font(Gfx::FontDatabase::default_font().bold_variant()); m_title_label->set_font(Gfx::FontDatabase::default_font().bold_variant());
m_title_label->set_fixed_height(m_title_label->font().pixel_size_rounded_up() + 2); m_title_label->set_fixed_height(m_title_label->font().pixel_size_rounded_up() + 2);
m_title_label->set_text_alignment(Gfx::TextAlignment::TopLeft); m_title_label->set_text_alignment(Gfx::TextAlignment::TopLeft);
m_subtitle_label = TRY(header_widget->try_add<Label>(move(subtitle))); m_subtitle_label = header_widget.add<Label>(move(subtitle));
m_subtitle_label->set_text_alignment(Gfx::TextAlignment::TopLeft); m_subtitle_label->set_text_alignment(Gfx::TextAlignment::TopLeft);
m_subtitle_label->set_fixed_height(m_subtitle_label->font().pixel_size_rounded_up()); m_subtitle_label->set_fixed_height(m_subtitle_label->font().pixel_size_rounded_up());
header_widget->add_spacer(); header_widget.add_spacer();
auto separator = TRY(try_add<SeparatorWidget>(Gfx::Orientation::Horizontal)); auto& separator = add<SeparatorWidget>(Gfx::Orientation::Horizontal);
separator->set_fixed_height(2); separator.set_fixed_height(2);
m_body_widget = TRY(try_add<Widget>()); m_body_widget = add<Widget>();
m_body_widget->set_layout<VerticalBoxLayout>(20); m_body_widget->set_layout<VerticalBoxLayout>(20);
return {}; return {};

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

@ -78,17 +78,17 @@ ErrorOr<void> TaskbarWindow::populate_taskbar()
m_quick_launch = TRY(Taskbar::QuickLaunchWidget::create()); m_quick_launch = TRY(Taskbar::QuickLaunchWidget::create());
TRY(main_widget->try_add_child(*m_quick_launch)); TRY(main_widget->try_add_child(*m_quick_launch));
m_task_button_container = TRY(main_widget->try_add<GUI::Widget>()); m_task_button_container = main_widget->add<GUI::Widget>();
m_task_button_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 3); m_task_button_container->set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 3);
m_default_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png"sv)); m_default_icon = TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/window.png"sv));
m_applet_area_container = TRY(main_widget->try_add<GUI::Frame>()); m_applet_area_container = main_widget->add<GUI::Frame>();
m_applet_area_container->set_frame_style(Gfx::FrameStyle::SunkenPanel); m_applet_area_container->set_frame_style(Gfx::FrameStyle::SunkenPanel);
m_clock_widget = TRY(main_widget->try_add<Taskbar::ClockWidget>()); m_clock_widget = main_widget->add<Taskbar::ClockWidget>();
m_show_desktop_button = TRY(main_widget->try_add<GUI::Button>()); m_show_desktop_button = main_widget->add<GUI::Button>();
m_show_desktop_button->set_tooltip_deprecated("Show Desktop"); m_show_desktop_button->set_tooltip_deprecated("Show Desktop");
m_show_desktop_button->set_icon(TRY(GUI::Icon::try_create_default_icon("desktop"sv)).bitmap_for_size(16)); m_show_desktop_button->set_icon(TRY(GUI::Icon::try_create_default_icon("desktop"sv)).bitmap_for_size(16));
m_show_desktop_button->set_button_style(Gfx::ButtonStyle::Coolbar); m_show_desktop_button->set_button_style(Gfx::ButtonStyle::Coolbar);