diff --git a/Base/res/devel/templates/serenity-application/main.cpp b/Base/res/devel/templates/serenity-application/main.cpp index 6e25794213..a7a2efdf90 100644 --- a/Base/res/devel/templates/serenity-application/main.cpp +++ b/Base/res/devel/templates/serenity-application/main.cpp @@ -24,8 +24,8 @@ ErrorOr serenity_main(Main::Arguments arguments) main_widget->set_layout(16); - auto button = TRY(main_widget->try_add("Click me!"_string)); - button->on_click = [&](auto) { + auto& button = main_widget->add("Click me!"_string); + button.on_click = [&](auto) { GUI::MessageBox::show(window, "Hello friends!"sv, ":^)"sv); }; diff --git a/Userland/Applications/CrashReporter/main.cpp b/Userland/Applications/CrashReporter/main.cpp index 8083ffc62f..ef1f053837 100644 --- a/Userland/Applications/CrashReporter/main.cpp +++ b/Userland/Applications/CrashReporter/main.cpp @@ -239,41 +239,41 @@ ErrorOr serenity_main(Main::Arguments arguments) auto& backtrace_tab = tab_widget.add_tab("Backtrace"_string); backtrace_tab.set_layout(4); - auto backtrace_label = TRY(backtrace_tab.try_add("A backtrace for each thread alive during the crash is listed below:"_string)); - backtrace_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - backtrace_label->set_fixed_height(16); + auto& backtrace_label = backtrace_tab.add("A backtrace for each thread alive during the crash is listed below:"_string); + backtrace_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + backtrace_label.set_fixed_height(16); - auto backtrace_tab_widget = TRY(backtrace_tab.try_add()); - backtrace_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); + auto& backtrace_tab_widget = backtrace_tab.add(); + backtrace_tab_widget.set_tab_position(GUI::TabWidget::TabPosition::Bottom); auto& cpu_registers_tab = tab_widget.add_tab("CPU Registers"_string); cpu_registers_tab.set_layout(4); - auto cpu_registers_label = TRY(cpu_registers_tab.try_add("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_fixed_height(16); + auto& cpu_registers_label = cpu_registers_tab.add("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_fixed_height(16); - auto cpu_registers_tab_widget = TRY(cpu_registers_tab.try_add()); - cpu_registers_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); + auto& cpu_registers_tab_widget = cpu_registers_tab.add(); + cpu_registers_tab_widget.set_tab_position(GUI::TabWidget::TabPosition::Bottom); auto& environment_tab = tab_widget.add_tab("Environment"_string); environment_tab.set_layout(4); - auto environment_text_editor = TRY(environment_tab.try_add()); - environment_text_editor->set_text(DeprecatedString::join('\n', environment)); - environment_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); - environment_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); - environment_text_editor->set_should_hide_unnecessary_scrollbars(true); + auto& environment_text_editor = environment_tab.add(); + environment_text_editor.set_text(DeprecatedString::join('\n', environment)); + environment_text_editor.set_mode(GUI::TextEditor::Mode::ReadOnly); + environment_text_editor.set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); + environment_text_editor.set_should_hide_unnecessary_scrollbars(true); auto& memory_regions_tab = tab_widget.add_tab("Memory Regions"_string); memory_regions_tab.set_layout(4); - auto memory_regions_text_editor = TRY(memory_regions_tab.try_add()); - 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_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); - memory_regions_text_editor->set_should_hide_unnecessary_scrollbars(true); - memory_regions_text_editor->set_visualize_trailing_whitespace(false); + auto& memory_regions_text_editor = memory_regions_tab.add(); + 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_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); + memory_regions_text_editor.set_should_hide_unnecessary_scrollbars(true); + memory_regions_text_editor.set_visualize_trailing_whitespace(false); auto& close_button = *widget->find_descendant_of_type_named("close_button"); close_button.on_click = [&](auto) { @@ -330,24 +330,24 @@ ErrorOr serenity_main(Main::Arguments arguments) }, [&](auto results) -> ErrorOr { for (auto& backtrace : results.thread_backtraces) { - auto& container = backtrace_tab_widget->add_tab(TRY(String::from_deprecated_string(backtrace.title))); + auto& container = backtrace_tab_widget.add_tab(TRY(String::from_deprecated_string(backtrace.title))); container.template set_layout(4); - auto backtrace_text_editor = TRY(container.template try_add()); - backtrace_text_editor->set_text(backtrace.text); - backtrace_text_editor->set_mode(GUI::TextEditor::Mode::ReadOnly); - backtrace_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); - backtrace_text_editor->set_should_hide_unnecessary_scrollbars(true); + auto& backtrace_text_editor = container.template add(); + backtrace_text_editor.set_text(backtrace.text); + backtrace_text_editor.set_mode(GUI::TextEditor::Mode::ReadOnly); + backtrace_text_editor.set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); + backtrace_text_editor.set_should_hide_unnecessary_scrollbars(true); TRY(full_backtrace.try_appendff("==== {} ====\n{}\n", backtrace.title, backtrace.text)); } for (auto& cpu_registers : results.thread_cpu_registers) { - auto& container = cpu_registers_tab_widget->add_tab(TRY(String::from_deprecated_string(cpu_registers.title))); + auto& container = cpu_registers_tab_widget.add_tab(TRY(String::from_deprecated_string(cpu_registers.title))); container.template set_layout(4); - auto cpu_registers_text_editor = TRY(container.template try_add()); - cpu_registers_text_editor->set_text(cpu_registers.text); - 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_should_hide_unnecessary_scrollbars(true); + auto& cpu_registers_text_editor = container.template add(); + cpu_registers_text_editor.set_text(cpu_registers.text); + 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_should_hide_unnecessary_scrollbars(true); } progressbar.set_visible(false); diff --git a/Userland/Applications/FileManager/PropertiesWindow.cpp b/Userland/Applications/FileManager/PropertiesWindow.cpp index 66be43956e..fb04f27bdc 100644 --- a/Userland/Applications/FileManager/PropertiesWindow.cpp +++ b/Userland/Applications/FileManager/PropertiesWindow.cpp @@ -74,15 +74,15 @@ ErrorOr PropertiesWindow::create_widgets(bool disable_rename) main_widget->set_layout(4, 6); main_widget->set_fill_with_background_color(true); - auto tab_widget = TRY(main_widget->try_add()); + auto& tab_widget = main_widget->add(); TRY(create_general_tab(tab_widget, disable_rename)); TRY(create_file_type_specific_tabs(tab_widget)); - auto button_widget = TRY(main_widget->try_add()); - button_widget->set_layout(GUI::Margins {}, 5); - button_widget->set_fixed_height(22); + auto& button_widget = main_widget->add(); + button_widget.set_layout(GUI::Margins {}, 5); + button_widget.set_fixed_height(22); - button_widget->add_spacer(); + button_widget.add_spacer(); auto ok_button = TRY(make_button("OK"_string, button_widget)); ok_button->on_click = [this](auto) { @@ -594,8 +594,8 @@ ErrorOr PropertiesWindow::setup_permission_checkboxes(GUI::CheckBox& box_r ErrorOr> PropertiesWindow::make_button(String text, GUI::Widget& parent) { - auto button = TRY(parent.try_add(text)); - button->set_fixed_size(70, 22); + auto& button = parent.add(text); + button.set_fixed_size(70, 22); return button; } diff --git a/Userland/Applications/ImageViewer/main.cpp b/Userland/Applications/ImageViewer/main.cpp index c141fc7faf..a88f9b8fb5 100644 --- a/Userland/Applications/ImageViewer/main.cpp +++ b/Userland/Applications/ImageViewer/main.cpp @@ -72,24 +72,24 @@ ErrorOr serenity_main(Main::Arguments arguments) auto root_widget = window->set_main_widget(); - auto toolbar_container = TRY(root_widget->try_add()); - auto main_toolbar = TRY(toolbar_container->try_add()); + auto& toolbar_container = root_widget->add(); + auto& main_toolbar = toolbar_container.add(); - auto widget = TRY(root_widget->try_add()); - widget->on_scale_change = [&](float scale) { - if (!widget->image()) { + auto& widget = root_widget->add(); + widget.on_scale_change = [&](float scale) { + if (!widget.image()) { window->set_title("Image Viewer"); 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()) { - widget->set_scaled_for_first_image(true); - widget->resize_window(); + if (!widget.scaled_for_first_image()) { + widget.set_scaled_for_first_image(true); + widget.resize_window(); } }; - widget->on_drop = [&](auto& event) { + widget.on_drop = [&](auto& event) { if (!event.mime_data().has_urls()) return; @@ -106,16 +106,16 @@ ErrorOr serenity_main(Main::Arguments arguments) return; 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) { 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()); - toolbar_container->set_visible(!window->is_fullscreen()); - widget->set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer); + toolbar_container.set_visible(!window->is_fullscreen()); + widget.set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer); }; // Actions @@ -130,12 +130,12 @@ ErrorOr serenity_main(Main::Arguments arguments) return; 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&) { - auto path = widget->path(); + auto path = widget.path(); if (path.is_empty()) return; @@ -148,7 +148,7 @@ ErrorOr serenity_main(Main::Arguments arguments) if (msgbox_result == GUI::MessageBox::ExecResult::Cancel) 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()) { GUI::MessageBox::show(window, DeprecatedString::formatted("unlink({}) failed: {}", path, unlinked_or_error.error()), @@ -158,7 +158,7 @@ ErrorOr serenity_main(Main::Arguments arguments) return; } - widget->clear(); + widget.clear(); }); auto quit_action = GUI::CommonActions::make_quit_action( @@ -167,28 +167,28 @@ ErrorOr serenity_main(Main::Arguments arguments) }); 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&) { - 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&) { - 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&) { - 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&) { - 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, - DeprecatedString::formatted("set_wallpaper({}) failed", widget->path()), + DeprecatedString::formatted("set_wallpaper({}) failed", widget.path()), "Could not set wallpaper"sv, GUI::MessageBox::Type::Error); } @@ -196,84 +196,84 @@ ErrorOr 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&) { - 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&) { - 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&) { - 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&) { - widget->navigate(ViewWidget::Directions::Last); + widget.navigate(ViewWidget::Directions::Last); }); auto full_screen_action = GUI::CommonActions::make_fullscreen_action( [&](auto&) { - widget->on_doubleclick(); + widget.on_doubleclick(); }); auto zoom_in_action = GUI::CommonActions::make_zoom_in_action( [&](auto&) { - widget->set_scale(widget->scale() * 1.44f); + widget.set_scale(widget.scale() * 1.44f); }, window); auto reset_zoom_action = GUI::CommonActions::make_reset_zoom_action( [&](auto&) { - widget->set_scale(1.f); + widget.set_scale(1.f); }, window); 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&) { - widget->fit_content_to_view(); + widget.fit_content_to_view(); }); auto zoom_out_action = GUI::CommonActions::make_zoom_out_action( [&](auto&) { - widget->set_scale(widget->scale() / 1.44f); + widget.set_scale(widget.scale() / 1.44f); }, window); auto hide_show_toolbar_action = GUI::Action::create_checkable("&Toolbar", { Mod_Ctrl, Key_T }, [&](auto& action) { - toolbar_container->set_visible(action.is_checked()); + toolbar_container.set_visible(action.is_checked()); }); hide_show_toolbar_action->set_checked(true); auto copy_action = GUI::CommonActions::make_copy_action([&](auto&) { - if (widget->image()) - GUI::Clipboard::the().set_bitmap(*widget->image()->bitmap({}).release_value_but_fixme_should_propagate_errors()); + if (widget.image()) + 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&) { - widget->set_scaling_mode(Gfx::Painter::ScalingMode::NearestNeighbor); + widget.set_scaling_mode(Gfx::Painter::ScalingMode::NearestNeighbor); }); nearest_neighbor_action->set_checked(true); 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&) { - 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&) { - 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_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_forward_actions = (widget.is_next_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); rotate_counterclockwise_action->set_enabled(should_enable_image_actions); rotate_clockwise_action->set_enabled(should_enable_image_actions); @@ -294,17 +294,17 @@ ErrorOr serenity_main(Main::Arguments arguments) } }; - main_toolbar->add_action(open_action); - main_toolbar->add_action(delete_action); - main_toolbar->add_separator(); - main_toolbar->add_action(go_first_action); - main_toolbar->add_action(go_back_action); - main_toolbar->add_action(go_forward_action); - main_toolbar->add_action(go_last_action); - main_toolbar->add_separator(); - main_toolbar->add_action(zoom_in_action); - main_toolbar->add_action(reset_zoom_action); - main_toolbar->add_action(zoom_out_action); + main_toolbar.add_action(open_action); + main_toolbar.add_action(delete_action); + main_toolbar.add_separator(); + main_toolbar.add_action(go_first_action); + main_toolbar.add_action(go_back_action); + main_toolbar.add_action(go_forward_action); + main_toolbar.add_action(go_last_action); + main_toolbar.add_separator(); + main_toolbar.add_action(zoom_in_action); + main_toolbar.add_action(reset_zoom_action); + main_toolbar.add_action(zoom_out_action); auto file_menu = window->add_menu("&File"_string); file_menu->add_action(open_action); @@ -318,7 +318,7 @@ ErrorOr serenity_main(Main::Arguments arguments) return; 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); @@ -380,9 +380,9 @@ ErrorOr serenity_main(Main::Arguments arguments) return 1; auto value = result.release_value(); - widget->open_file(value.filename(), value.stream()); + widget.open_file(value.filename(), value.stream()); } else { - widget->clear(); + widget.clear(); } return app->exec(); diff --git a/Userland/Applications/Maps/main.cpp b/Userland/Applications/Maps/main.cpp index b65cda4b22..08ce5e12e0 100644 --- a/Userland/Applications/Maps/main.cpp +++ b/Userland/Applications/Maps/main.cpp @@ -49,35 +49,35 @@ ErrorOr serenity_main(Main::Arguments arguments) root_widget->set_layout(GUI::Margins {}, 2); // Toolbar - auto toolbar_container = TRY(root_widget->try_add()); - auto toolbar = TRY(toolbar_container->try_add()); + auto& toolbar_container = root_widget->add(); + auto& toolbar = toolbar_container.add(); // Main Widget - auto main_widget = TRY(root_widget->try_add()); + auto& main_widget = root_widget->add(); // Map widget 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.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); - auto map_widget = TRY(main_widget->try_add(options)); - map_widget->set_frame_style(Gfx::FrameStyle::SunkenContainer); - map_widget->set_show_users(Config::read_bool("Maps"sv, "MapView"sv, "ShowUsers"sv, false)); + auto& map_widget = main_widget.add(options); + map_widget.set_frame_style(Gfx::FrameStyle::SunkenContainer); + map_widget.set_show_users(Config::read_bool("Maps"sv, "MapView"sv, "ShowUsers"sv, false)); // Search panel 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_selected_place_change = [map_widget](auto const& place) { + 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) { // 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 - map_widget->add_marker({ place.latlng, place.name, {}, "search"_string }); - map_widget->set_center(place.latlng); - map_widget->set_zoom(place.zoom); + map_widget.add_marker({ place.latlng, place.name, {}, "search"_string }); + map_widget.set_center(place.latlng); + map_widget.set_zoom(place.zoom); }; 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 auto file_menu = window->add_menu("&File"_string); @@ -90,27 +90,27 @@ ErrorOr serenity_main(Main::Arguments arguments) auto view_menu = window->add_menu("&View"_string); 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()) { - main_widget->insert_child_before(search_panel, map_widget); + main_widget.insert_child_before(search_panel, map_widget); } else { - map_widget->remove_markers_with_name("search"sv); + map_widget.remove_markers_with_name("search"sv); search_panel->reset(); - main_widget->remove_child(search_panel); + main_widget.remove_child(search_panel); } }, window); show_search_panel_action->set_checked(Config::read_bool("Maps"sv, "SearchPanel"sv, "Show"sv, false)); 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_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_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 fullscreen_action = GUI::CommonActions::make_fullscreen_action([window, toolbar_container, map_widget](auto&) { + "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()); + 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 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&) { window->set_fullscreen(!window->is_fullscreen()); - toolbar_container->set_visible(!window->is_fullscreen()); - map_widget->set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer); + toolbar_container.set_visible(!window->is_fullscreen()); + map_widget.set_frame_style(window->is_fullscreen() ? Gfx::FrameStyle::NoFrame : Gfx::FrameStyle::SunkenContainer); }, window); view_menu->add_action(show_search_panel_action); @@ -128,24 +128,24 @@ ErrorOr serenity_main(Main::Arguments arguments) help_menu->add_action(GUI::CommonActions::make_about_action("Maps"_string, app_icon, window)); // Main toolbar actions - toolbar->add_action(show_search_panel_action); - toolbar->add_separator(); - toolbar->add_action(show_users_action); - toolbar->add_separator(); - toolbar->add_action(zoom_in_action); - toolbar->add_action(zoom_out_action); - toolbar->add_action(reset_zoom_action); - toolbar->add_separator(); - toolbar->add_action(open_settings_action); + toolbar.add_action(show_search_panel_action); + toolbar.add_separator(); + toolbar.add_action(show_users_action); + toolbar.add_separator(); + toolbar.add_action(zoom_in_action); + toolbar.add_action(zoom_out_action); + toolbar.add_action(reset_zoom_action); + toolbar.add_separator(); + toolbar.add_action(open_settings_action); window->show(); // Remember last window state int exec = app->exec(); 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, "CenterLongitude"sv, TRY(String::number(map_widget->center().longitude))); - 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_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_i32("Maps"sv, "MapView"sv, "Zoom"sv, map_widget.zoom()); + Config::write_bool("Maps"sv, "MapView"sv, "ShowUsers"sv, map_widget.show_users()); return exec; } diff --git a/Userland/Applications/Piano/MainWidget.cpp b/Userland/Applications/Piano/MainWidget.cpp index 0e3f8664ec..b0bb11f9b3 100644 --- a/Userland/Applications/Piano/MainWidget.cpp +++ b/Userland/Applications/Piano/MainWidget.cpp @@ -39,11 +39,11 @@ ErrorOr MainWidget::initialize() set_layout(2, 2); set_fill_with_background_color(true); - m_wave_widget = TRY(try_add(m_track_manager)); + m_wave_widget = add(m_track_manager); m_wave_widget->set_fixed_height(100); TRY(m_wave_widget->set_sample_size(sample_count)); - m_tab_widget = TRY(try_add()); + m_tab_widget = add(); m_roll_widget = m_tab_widget->add_tab("Piano Roll"_string, m_track_manager); m_roll_widget->set_fixed_height(300); @@ -51,23 +51,23 @@ ErrorOr MainWidget::initialize() m_tab_widget->add_tab("Sampler"_string, m_track_manager); m_player_widget = TRY(try_add(m_track_manager, *this, m_audio_loop)); - m_keys_and_knobs_container = TRY(try_add()); + m_keys_and_knobs_container = add(); m_keys_and_knobs_container->set_layout(GUI::Margins {}, 2); m_keys_and_knobs_container->set_fixed_height(130); m_keys_and_knobs_container->set_fill_with_background_color(true); - m_keys_widget = TRY(m_keys_and_knobs_container->try_add(m_track_manager.keyboard())); + m_keys_widget = m_keys_and_knobs_container->add(m_track_manager.keyboard()); - m_octave_container = TRY(m_keys_and_knobs_container->try_add()); + m_octave_container = m_keys_and_knobs_container->add(); m_octave_container->set_preferred_width(GUI::SpecialDimension::Fit); m_octave_container->set_layout(); - auto octave_label = TRY(m_octave_container->try_add("Octave"_string)); - octave_label->set_preferred_width(GUI::SpecialDimension::Fit); - m_octave_value = TRY(m_octave_container->try_add(TRY(String::number(m_track_manager.keyboard()->virtual_keyboard_octave())))); + auto& octave_label = m_octave_container->add("Octave"_string); + octave_label.set_preferred_width(GUI::SpecialDimension::Fit); + m_octave_value = m_octave_container->add(TRY(String::number(m_track_manager.keyboard()->virtual_keyboard_octave()))); m_octave_value->set_preferred_width(GUI::SpecialDimension::Fit); // FIXME: Implement vertical flipping in GUI::Slider, not here. - m_octave_knob = TRY(m_octave_container->try_add()); + m_octave_knob = m_octave_container->add(); 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_range(octave_min - 1, octave_max - 1); @@ -80,7 +80,7 @@ ErrorOr MainWidget::initialize() 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()); + m_knobs_widget = m_keys_and_knobs_container->add(); for (auto track : m_track_manager.tracks()) TRY(m_track_controls.try_append(TRY(m_knobs_widget->try_add(TRY(track->try_make_weak_ptr()))))); diff --git a/Userland/Applications/Piano/PlayerWidget.cpp b/Userland/Applications/Piano/PlayerWidget.cpp index 5eb68bac80..b726dfe955 100644 --- a/Userland/Applications/Piano/PlayerWidget.cpp +++ b/Userland/Applications/Piano/PlayerWidget.cpp @@ -45,10 +45,10 @@ ErrorOr PlayerWidget::initialize() set_fill_with_background_color(true); TRY(m_track_number_choices.try_append("1")); - RefPtr label = TRY(try_add("Track"_string)); + RefPtr label = add("Track"_string); label->set_max_width(75); - m_track_dropdown = TRY(try_add()); + m_track_dropdown = add(); m_track_dropdown->set_max_width(75); m_track_dropdown->set_model(*GUI::ItemListModel::create(m_track_number_choices)); m_track_dropdown->set_only_allow_values_from_model(true); @@ -59,7 +59,7 @@ ErrorOr PlayerWidget::initialize() m_main_widget.update_selected_track(); }; - m_add_track_button = TRY(try_add()); + m_add_track_button = add(); m_add_track_button->set_icon(*m_add_track_icon); m_add_track_button->set_fixed_width(30); m_add_track_button->set_tooltip_deprecated("Add Track"); @@ -68,7 +68,7 @@ ErrorOr PlayerWidget::initialize() add_track(); }; - m_next_track_button = TRY(try_add()); + m_next_track_button = add(); m_next_track_button->set_icon(*m_next_track_icon); m_next_track_button->set_fixed_width(30); m_next_track_button->set_tooltip_deprecated("Next Track"); @@ -77,7 +77,7 @@ ErrorOr PlayerWidget::initialize() next_track(); }; - m_play_button = TRY(try_add()); + m_play_button = add(); m_play_button->set_icon(*m_pause_icon); m_play_button->set_fixed_width(30); m_play_button->set_tooltip_deprecated("Play/Pause playback"); @@ -92,7 +92,7 @@ ErrorOr PlayerWidget::initialize() } }; - m_back_button = TRY(try_add()); + m_back_button = add(); m_back_button->set_icon(*m_back_icon); m_back_button->set_fixed_width(30); m_back_button->set_tooltip_deprecated("Previous Note"); @@ -101,7 +101,7 @@ ErrorOr PlayerWidget::initialize() m_track_manager.time_forward(-(sample_rate / (beats_per_minute / 60) / notes_per_beat)); }; - m_next_button = TRY(try_add()); + m_next_button = add(); m_next_button->set_icon(*m_next_icon); m_next_button->set_fixed_width(30); m_next_button->set_tooltip_deprecated("Next Note"); diff --git a/Userland/Applications/Piano/TrackControlsWidget.cpp b/Userland/Applications/Piano/TrackControlsWidget.cpp index ed8f35a192..cc6468c8ac 100644 --- a/Userland/Applications/Piano/TrackControlsWidget.cpp +++ b/Userland/Applications/Piano/TrackControlsWidget.cpp @@ -26,24 +26,24 @@ ErrorOr> TrackControlsWidget::try_create(Weak widget->set_preferred_width(GUI::SpecialDimension::Grow); widget->set_fill_with_background_color(true); - auto mastering_parameters = TRY(widget->try_add()); - mastering_parameters->set_layout(); + auto& mastering_parameters = widget->add(); + mastering_parameters.set_layout(); auto strong_track = widget->m_track.value(); for (auto& parameter : strong_track->track_mastering()->parameters()) - (void)TRY(mastering_parameters->try_add(parameter)); + mastering_parameters.add(parameter); TRY(widget->m_processor_groups.try_append(mastering_parameters)); widget->add_spacer(); for (auto& processor : strong_track->processor_chain()) { - auto processor_parameters = TRY(widget->try_add()); - processor_parameters->set_layout(); + auto& processor_parameters = widget->add(); + processor_parameters.set_layout(); for (auto& parameter : processor->parameters()) - (void)TRY(processor_parameters->try_add(parameter)); + processor_parameters.add(parameter); TRY(widget->m_processor_groups.try_append(processor_parameters)); } diff --git a/Userland/Applications/PixelPaint/Filters/Bloom.cpp b/Userland/Applications/PixelPaint/Filters/Bloom.cpp index 136c7c97ce..fd66b0623a 100644 --- a/Userland/Applications/PixelPaint/Filters/Bloom.cpp +++ b/Userland/Applications/PixelPaint/Filters/Bloom.cpp @@ -40,39 +40,39 @@ ErrorOr> Bloom::get_settings_widget() auto settings_widget = GUI::Widget::construct(); settings_widget->set_layout(); - auto name_label = TRY(settings_widget->try_add("Bloom Filter"_string)); - name_label->set_font_weight(Gfx::FontWeight::Bold); - name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - name_label->set_fixed_height(20); + auto& name_label = settings_widget->add("Bloom Filter"_string); + name_label.set_font_weight(Gfx::FontWeight::Bold); + name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + name_label.set_fixed_height(20); - auto luma_lower_container = TRY(settings_widget->try_add()); - luma_lower_container->set_fixed_height(50); - luma_lower_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); + auto& luma_lower_container = settings_widget->add(); + luma_lower_container.set_fixed_height(50); + luma_lower_container.set_layout(GUI::Margins { 4, 0, 4, 0 }); - auto luma_lower_label = TRY(luma_lower_container->try_add("Luma lower bound:"_string)); - luma_lower_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - luma_lower_label->set_fixed_height(20); + auto& luma_lower_label = luma_lower_container.add("Luma lower bound:"_string); + luma_lower_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + luma_lower_label.set_fixed_height(20); - auto luma_lower_slider = TRY(luma_lower_container->try_add(Orientation::Horizontal)); - luma_lower_slider->set_range(0, 255); - luma_lower_slider->set_value(m_luma_lower); - luma_lower_slider->on_change = [&](int value) { + auto& luma_lower_slider = luma_lower_container.add(Orientation::Horizontal); + luma_lower_slider.set_range(0, 255); + luma_lower_slider.set_value(m_luma_lower); + luma_lower_slider.on_change = [&](int value) { m_luma_lower = value; update_preview(); }; - auto radius_container = TRY(settings_widget->try_add()); - radius_container->set_fixed_height(50); - radius_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); + auto& radius_container = settings_widget->add(); + radius_container.set_fixed_height(50); + radius_container.set_layout(GUI::Margins { 4, 0, 4, 0 }); - auto radius_label = TRY(radius_container->try_add("Blur Radius:"_string)); - radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - radius_label->set_fixed_height(20); + auto& radius_label = radius_container.add("Blur Radius:"_string); + radius_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + radius_label.set_fixed_height(20); - auto radius_slider = TRY(radius_container->try_add(Orientation::Horizontal, "px"_string)); - radius_slider->set_range(0, 50); - radius_slider->set_value(m_blur_radius); - radius_slider->on_change = [&](int value) { + auto& radius_slider = radius_container.add(Orientation::Horizontal, "px"_string); + radius_slider.set_range(0, 50); + radius_slider.set_value(m_blur_radius); + radius_slider.on_change = [&](int value) { m_blur_radius = value; update_preview(); }; diff --git a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp index f29a48199b..d26bd81ce3 100644 --- a/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp +++ b/Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp @@ -42,15 +42,15 @@ ErrorOr> FastBoxBlur::get_settings_widget() auto settings_widget = GUI::Widget::construct(); settings_widget->set_layout(); - auto name_label = TRY(settings_widget->try_add("Fast Box Blur Filter"_string)); - name_label->set_font_weight(Gfx::FontWeight::Bold); - name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - name_label->set_fixed_height(10); + auto& name_label = settings_widget->add("Fast Box Blur Filter"_string); + name_label.set_font_weight(Gfx::FontWeight::Bold); + name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + name_label.set_fixed_height(10); - auto asymmetric_checkbox = TRY(settings_widget->try_add("Use Asymmetric Radii"_string)); - asymmetric_checkbox->set_checked(false); - asymmetric_checkbox->set_fixed_height(15); - asymmetric_checkbox->on_checked = [this](bool checked) { + auto& asymmetric_checkbox = settings_widget->add("Use Asymmetric Radii"_string); + asymmetric_checkbox.set_checked(false); + asymmetric_checkbox.set_fixed_height(15); + asymmetric_checkbox.on_checked = [this](bool checked) { m_use_asymmetric_radii = checked; if (m_use_asymmetric_radii) { m_vector_checkbox->set_visible(true); @@ -68,7 +68,7 @@ ErrorOr> FastBoxBlur::get_settings_widget() update_preview(); }; - m_vector_checkbox = TRY(settings_widget->try_add("Use Direction and magnitude"_string)); + m_vector_checkbox = settings_widget->add("Use Direction and magnitude"_string); m_vector_checkbox->set_checked(false); m_vector_checkbox->set_visible(false); m_vector_checkbox->set_fixed_height(15); @@ -84,36 +84,36 @@ ErrorOr> FastBoxBlur::get_settings_widget() update_preview(); }; - m_radius_container = TRY(settings_widget->try_add()); + m_radius_container = settings_widget->add(); m_radius_container->set_fixed_height(20); m_radius_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); - auto radius_label = TRY(m_radius_container->try_add("Radius:"_string)); - radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - radius_label->set_fixed_size(50, 20); + auto& radius_label = m_radius_container->add("Radius:"_string); + radius_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + radius_label.set_fixed_size(50, 20); - auto radius_slider = TRY(m_radius_container->try_add(Orientation::Horizontal, "px"_string)); - radius_slider->set_range(0, 25); - radius_slider->set_value(m_radius); - radius_slider->on_change = [&](int value) { + auto& radius_slider = m_radius_container->add(Orientation::Horizontal, "px"_string); + radius_slider.set_range(0, 25); + radius_slider.set_value(m_radius); + radius_slider.on_change = [&](int value) { m_radius = value; update_preview(); }; - m_asymmetric_radius_container = TRY(settings_widget->try_add()); + m_asymmetric_radius_container = settings_widget->add(); m_asymmetric_radius_container->set_visible(false); m_asymmetric_radius_container->set_fixed_height(50); m_asymmetric_radius_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); - auto radius_x_container = TRY(m_asymmetric_radius_container->try_add()); - radius_x_container->set_fixed_height(20); - radius_x_container->set_layout(); + auto& radius_x_container = m_asymmetric_radius_container->add(); + radius_x_container.set_fixed_height(20); + radius_x_container.set_layout(); - auto radius_x_label = TRY(radius_x_container->try_add("Radius X:"_string)); - radius_x_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - radius_x_label->set_fixed_size(50, 20); + auto& radius_x_label = radius_x_container.add("Radius X:"_string); + radius_x_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + radius_x_label.set_fixed_size(50, 20); - m_radius_x_slider = TRY(radius_x_container->try_add(Orientation::Horizontal, "px"_string)); + m_radius_x_slider = radius_x_container.add(Orientation::Horizontal, "px"_string); m_radius_x_slider->set_range(0, 50); m_radius_x_slider->set_value(m_radius_x); m_radius_x_slider->on_change = [&](int value) { @@ -121,15 +121,15 @@ ErrorOr> FastBoxBlur::get_settings_widget() update_preview(); }; - auto radius_y_container = TRY(m_asymmetric_radius_container->try_add()); - radius_y_container->set_fixed_height(20); - radius_y_container->set_layout(); + auto& radius_y_container = m_asymmetric_radius_container->add(); + radius_y_container.set_fixed_height(20); + radius_y_container.set_layout(); - auto radius_y_label = TRY(radius_y_container->try_add("Radius Y:"_string)); - radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - radius_y_label->set_fixed_size(50, 20); + auto& radius_y_label = radius_y_container.add("Radius Y:"_string); + radius_y_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + radius_y_label.set_fixed_size(50, 20); - m_radius_y_slider = TRY(radius_y_container->try_add(Orientation::Horizontal, "px"_string)); + m_radius_y_slider = radius_y_container.add(Orientation::Horizontal, "px"_string); m_radius_y_slider->set_range(0, 50); m_radius_y_slider->set_value(m_radius_y); m_radius_y_slider->on_change = [&](int value) { @@ -137,20 +137,20 @@ ErrorOr> FastBoxBlur::get_settings_widget() update_preview(); }; - m_vector_container = TRY(settings_widget->try_add()); + m_vector_container = settings_widget->add(); m_vector_container->set_visible(false); m_vector_container->set_fixed_height(50); m_vector_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); - auto angle_container = TRY(m_vector_container->try_add()); - angle_container->set_fixed_height(20); - angle_container->set_layout(); + auto& angle_container = m_vector_container->add(); + angle_container.set_fixed_height(20); + angle_container.set_layout(); - auto angle_label = TRY(angle_container->try_add("Angle:"_string)); - angle_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - angle_label->set_fixed_size(60, 20); + auto& angle_label = angle_container.add("Angle:"_string); + angle_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + angle_label.set_fixed_size(60, 20); - m_angle_slider = TRY(angle_container->try_add(Orientation::Horizontal, "°"_string)); + m_angle_slider = angle_container.add(Orientation::Horizontal, "°"_string); m_angle_slider->set_range(0, 360); m_angle_slider->set_value(m_angle); m_angle_slider->on_change = [&](int value) { @@ -158,15 +158,15 @@ ErrorOr> FastBoxBlur::get_settings_widget() update_preview(); }; - auto magnitude_container = TRY(m_vector_container->try_add()); - magnitude_container->set_fixed_height(20); - magnitude_container->set_layout(); + auto& magnitude_container = m_vector_container->add(); + magnitude_container.set_fixed_height(20); + magnitude_container.set_layout(); - auto magnitude_label = TRY(magnitude_container->try_add("Magnitude:"_string)); - magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - magnitude_label->set_fixed_size(60, 20); + auto& magnitude_label = magnitude_container.add("Magnitude:"_string); + magnitude_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + magnitude_label.set_fixed_size(60, 20); - m_magnitude_slider = TRY(magnitude_container->try_add(Orientation::Horizontal, "px"_string)); + m_magnitude_slider = magnitude_container.add(Orientation::Horizontal, "px"_string); m_magnitude_slider->set_range(0, 50); m_magnitude_slider->set_value(m_radius); m_magnitude_slider->on_change = [&](int value) { @@ -174,11 +174,11 @@ ErrorOr> FastBoxBlur::get_settings_widget() update_preview(); }; - auto gaussian_container = TRY(settings_widget->try_add()); - gaussian_container->set_fixed_height(20); - gaussian_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); + auto& gaussian_container = settings_widget->add(); + gaussian_container.set_fixed_height(20); + gaussian_container.set_layout(GUI::Margins { 4, 0, 4, 0 }); - m_gaussian_checkbox = TRY(gaussian_container->try_add("Approximate Gaussian Blur"_string)); + m_gaussian_checkbox = gaussian_container.add("Approximate Gaussian Blur"_string); 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->on_checked = [this](bool checked) { diff --git a/Userland/Applications/PixelPaint/Filters/Filter.cpp b/Userland/Applications/PixelPaint/Filters/Filter.cpp index 97c0572086..457dccf562 100644 --- a/Userland/Applications/PixelPaint/Filters/Filter.cpp +++ b/Userland/Applications/PixelPaint/Filters/Filter.cpp @@ -28,10 +28,10 @@ ErrorOr> Filter::get_settings_widget() auto settings_widget = GUI::Widget::construct(); settings_widget->set_layout(); - auto name_label = TRY(settings_widget->try_add(TRY(String::from_utf8(filter_name())))); - name_label->set_text_alignment(Gfx::TextAlignment::TopLeft); + auto& name_label = settings_widget->add(TRY(String::from_utf8(filter_name()))); + name_label.set_text_alignment(Gfx::TextAlignment::TopLeft); - (void)TRY(settings_widget->try_add()); + settings_widget->add(); m_settings_widget = settings_widget; } diff --git a/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp b/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp index c14490a3b0..1ad1727a85 100644 --- a/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp +++ b/Userland/Applications/PixelPaint/Filters/HueAndSaturation.cpp @@ -34,15 +34,15 @@ ErrorOr> HueAndSaturation::get_settings_widget() settings_widget->set_layout(); auto add_slider = [&](auto name, int min, int max, auto member) -> ErrorOr { - auto name_label = TRY(settings_widget->try_add(TRY(String::from_utf8(name)))); - name_label->set_font_weight(Gfx::FontWeight::Bold); - name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - name_label->set_fixed_height(20); + auto& name_label = settings_widget->add(TRY(String::from_utf8(name))); + name_label.set_font_weight(Gfx::FontWeight::Bold); + name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + name_label.set_fixed_height(20); - auto slider = TRY(settings_widget->try_add(Orientation::Horizontal)); - slider->set_range(min, max); - slider->set_value(m_hue); - slider->on_change = [this, member](int value) { + auto& slider = settings_widget->add(Orientation::Horizontal); + slider.set_range(min, max); + slider.set_value(m_hue); + slider.on_change = [this, member](int value) { this->*member = value; update_preview(); }; diff --git a/Userland/Applications/PixelPaint/Filters/Sepia.cpp b/Userland/Applications/PixelPaint/Filters/Sepia.cpp index d8c7771408..bd31686a48 100644 --- a/Userland/Applications/PixelPaint/Filters/Sepia.cpp +++ b/Userland/Applications/PixelPaint/Filters/Sepia.cpp @@ -23,23 +23,23 @@ ErrorOr> Sepia::get_settings_widget() auto settings_widget = GUI::Widget::construct(); settings_widget->set_layout(); - auto name_label = TRY(settings_widget->try_add("Sepia Filter"_string)); - name_label->set_font_weight(Gfx::FontWeight::Bold); - name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - name_label->set_fixed_height(20); + auto& name_label = settings_widget->add("Sepia Filter"_string); + name_label.set_font_weight(Gfx::FontWeight::Bold); + name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + name_label.set_fixed_height(20); - auto amount_container = TRY(settings_widget->try_add()); - amount_container->set_fixed_height(20); - amount_container->set_layout(GUI::Margins { 4, 0, 4, 0 }); + auto& amount_container = settings_widget->add(); + amount_container.set_fixed_height(20); + amount_container.set_layout(GUI::Margins { 4, 0, 4, 0 }); - auto amount_label = TRY(amount_container->try_add("Amount:"_string)); - amount_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - amount_label->set_fixed_size(50, 20); + auto& amount_label = amount_container.add("Amount:"_string); + amount_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + amount_label.set_fixed_size(50, 20); - auto amount_slider = TRY(amount_container->try_add(Orientation::Horizontal, "%"_string)); - amount_slider->set_range(0, 100); - amount_slider->set_value(m_amount * 100); - amount_slider->on_change = [this](int value) { + auto& amount_slider = amount_container.add(Orientation::Horizontal, "%"_string); + amount_slider.set_range(0, 100); + amount_slider.set_value(m_amount * 100); + amount_slider.on_change = [this](int value) { m_amount = value * 0.01f; update_preview(); }; diff --git a/Userland/Applications/PixelPaint/MainWidget.cpp b/Userland/Applications/PixelPaint/MainWidget.cpp index 7effaf89db..2b03ab271c 100644 --- a/Userland/Applications/PixelPaint/MainWidget.cpp +++ b/Userland/Applications/PixelPaint/MainWidget.cpp @@ -1190,7 +1190,7 @@ ErrorOr MainWidget::initialize_menubar(GUI::Window& window) toolbar.add_action(*m_zoom_out_action); toolbar.add_action(*m_reset_zoom_action); - m_zoom_combobox = TRY(toolbar.try_add()); + m_zoom_combobox = toolbar.add(); m_zoom_combobox->set_max_width(75); m_zoom_combobox->set_model(*GUI::ItemListModel::create(s_suggested_zoom_levels)); m_zoom_combobox->on_change = [this](DeprecatedString const& value, GUI::ModelIndex const& index) { diff --git a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp index ea658cad63..1a252163c8 100644 --- a/Userland/Applications/PixelPaint/Tools/BrushTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/BrushTool.cpp @@ -203,12 +203,12 @@ ErrorOr BrushTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(20); - mode_container->set_layout(); - auto mode_label = TRY(mode_container->try_add("Mode:"_string)); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(60, 20); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(20); + mode_container.set_layout(); + auto& mode_label = mode_container.add("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(60, 20); static constexpr auto s_mode_names = [] { Array names; @@ -233,18 +233,18 @@ ErrorOr BrushTool::get_properties_widget() return names; }(); - auto mode_combobox = TRY(mode_container->try_add()); - mode_combobox->set_only_allow_values_from_model(true); - mode_combobox->set_model(*GUI::ItemListModel::create(s_mode_names)); - mode_combobox->set_selected_index((int)m_mode, GUI::AllowCallback::No); + auto& mode_combobox = mode_container.add(); + mode_combobox.set_only_allow_values_from_model(true); + mode_combobox.set_model(*GUI::ItemListModel::create(s_mode_names)); + mode_combobox.set_selected_index((int)m_mode, GUI::AllowCallback::No); - auto priority_container = TRY(properties_widget->try_add()); - priority_container->set_fixed_height(20); - priority_container->set_visible(false); - priority_container->set_layout(); - auto priority_label = TRY(priority_container->try_add("Priority:"_string)); - priority_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - priority_label->set_fixed_size(60, 20); + auto& priority_container = properties_widget->add(); + priority_container.set_fixed_height(20); + priority_container.set_visible(false); + priority_container.set_layout(); + auto& priority_label = priority_container.add("Priority:"_string); + priority_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + priority_label.set_fixed_size(60, 20); static constexpr auto s_priority_names = [] { Array names; @@ -266,37 +266,37 @@ ErrorOr BrushTool::get_properties_widget() return names; }(); - auto priority_combobox = TRY(priority_container->try_add()); - priority_combobox->set_only_allow_values_from_model(true); - priority_combobox->set_model(*GUI::ItemListModel::create(s_priority_names)); - priority_combobox->set_selected_index((int)m_priority, GUI::AllowCallback::No); + auto& priority_combobox = priority_container.add(); + priority_combobox.set_only_allow_values_from_model(true); + priority_combobox.set_model(*GUI::ItemListModel::create(s_priority_names)); + priority_combobox.set_selected_index((int)m_priority, GUI::AllowCallback::No); - auto exposure_container = TRY(properties_widget->try_add()); - exposure_container->set_fixed_height(20); - exposure_container->set_visible(false); - exposure_container->set_layout(); + auto& exposure_container = properties_widget->add(); + exposure_container.set_fixed_height(20); + exposure_container.set_visible(false); + exposure_container.set_layout(); - auto exposure_label = TRY(exposure_container->try_add("Exposure:"_string)); - exposure_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - exposure_label->set_fixed_size(60, 20); + auto& exposure_label = exposure_container.add("Exposure:"_string); + exposure_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + exposure_label.set_fixed_size(60, 20); - auto exposure_slider = TRY(exposure_container->try_add(Orientation::Horizontal, "%"_string)); - exposure_slider->set_range(1, 100); - exposure_slider->set_value(m_exposure * 100); + auto& exposure_slider = exposure_container.add(Orientation::Horizontal, "%"_string); + exposure_slider.set_range(1, 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() < (int)BrushMode::__Count); m_mode = (BrushMode)model_index.row(); - priority_container->set_visible(m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn); - exposure_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); if (m_mode == BrushMode::Dodge || m_mode == BrushMode::Burn) 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() < (int)PriorityMode::__Count); @@ -304,47 +304,47 @@ ErrorOr BrushTool::get_properties_widget() update_precomputed_color_values(); }; - exposure_slider->on_change = [this](int value) { + exposure_slider.on_change = [this](int value) { m_exposure = value / 100.0f; update_precomputed_color_values(); }; - auto size_container = TRY(properties_widget->try_add()); - size_container->set_fixed_height(20); - size_container->set_layout(); + auto& size_container = properties_widget->add(); + size_container.set_fixed_height(20); + size_container.set_layout(); - auto size_label = TRY(size_container->try_add("Size:"_string)); - size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - size_label->set_fixed_size(60, 20); + auto& size_label = size_container.add("Size:"_string); + size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + size_label.set_fixed_size(60, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); - size_slider->set_range(1, 250); - size_slider->set_value(m_size); - size_slider->set_override_cursor(cursor()); + auto& size_slider = size_container.add(Orientation::Horizontal, "px"_string); + size_slider.set_range(1, 250); + size_slider.set_value(m_size); + 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); // 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()); - hardness_container->set_fixed_height(20); - hardness_container->set_layout(); + auto& hardness_container = properties_widget->add(); + hardness_container.set_fixed_height(20); + hardness_container.set_layout(); - auto hardness_label = TRY(hardness_container->try_add("Hardness:"_string)); - hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - hardness_label->set_fixed_size(60, 20); + auto& hardness_label = hardness_container.add("Hardness:"_string); + hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + hardness_label.set_fixed_size(60, 20); - auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_string)); - hardness_slider->set_range(1, 100); - hardness_slider->set_value(m_hardness); + auto& hardness_slider = hardness_container.add(Orientation::Horizontal, "%"_string); + hardness_slider.set_range(1, 100); + hardness_slider.set_value(m_hardness); - hardness_slider->on_change = [this](int value) { + hardness_slider.on_change = [this](int value) { set_hardness(value); }; - set_secondary_slider(hardness_slider); + set_secondary_slider(&hardness_slider); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/PixelPaint/Tools/BucketTool.cpp b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp index a4da2e9736..ebddaa08cf 100644 --- a/Userland/Applications/PixelPaint/Tools/BucketTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/BucketTool.cpp @@ -67,22 +67,22 @@ ErrorOr BucketTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto threshold_container = TRY(properties_widget->try_add()); - threshold_container->set_fixed_height(20); - threshold_container->set_layout(); + auto& threshold_container = properties_widget->add(); + threshold_container.set_fixed_height(20); + threshold_container.set_layout(); - auto threshold_label = TRY(threshold_container->try_add("Threshold:"_string)); - threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - threshold_label->set_fixed_size(80, 20); + auto& threshold_label = threshold_container.add("Threshold:"_string); + threshold_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + threshold_label.set_fixed_size(80, 20); - auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, "%"_string)); - threshold_slider->set_range(0, 100); - threshold_slider->set_value(m_threshold); + auto& threshold_slider = threshold_container.add(Orientation::Horizontal, "%"_string); + threshold_slider.set_range(0, 100); + threshold_slider.set_value(m_threshold); - threshold_slider->on_change = [this](int value) { + threshold_slider.on_change = [this](int value) { m_threshold = value; }; - set_primary_slider(threshold_slider); + set_primary_slider(&threshold_slider); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/PixelPaint/Tools/CloneTool.cpp b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp index ee7f6280c8..716df549c9 100644 --- a/Userland/Applications/PixelPaint/Tools/CloneTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/CloneTool.cpp @@ -131,40 +131,40 @@ ErrorOr CloneTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto size_container = TRY(properties_widget->try_add()); - size_container->set_fixed_height(20); - size_container->set_layout(); + auto& size_container = properties_widget->add(); + size_container.set_fixed_height(20); + size_container.set_layout(); - auto size_label = TRY(size_container->try_add("Size:"_string)); - size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - size_label->set_fixed_size(80, 20); + auto& size_label = size_container.add("Size:"_string); + size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + size_label.set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); - size_slider->set_range(1, 100); - size_slider->set_value(size()); + auto& size_slider = size_container.add(Orientation::Horizontal, "px"_string); + size_slider.set_range(1, 100); + 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(); set_size(value); 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()); - hardness_container->set_fixed_height(20); - hardness_container->set_layout(); + auto& hardness_container = properties_widget->add(); + hardness_container.set_fixed_height(20); + hardness_container.set_layout(); - auto hardness_label = TRY(hardness_container->try_add("Hardness:"_string)); - hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - hardness_label->set_fixed_size(80, 20); + auto& hardness_label = hardness_container.add("Hardness:"_string); + hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + hardness_label.set_fixed_size(80, 20); - auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_string)); - hardness_slider->set_range(1, 100); - hardness_slider->on_change = [&](int value) { + auto& hardness_slider = hardness_container.add(Orientation::Horizontal, "%"_string); + hardness_slider.set_range(1, 100); + hardness_slider.on_change = [&](int value) { set_hardness(value); }; - hardness_slider->set_value(100); - set_secondary_slider(hardness_slider); + hardness_slider.set_value(100); + set_secondary_slider(&hardness_slider); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp index 957c2e2785..8cf20c1c09 100644 --- a/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EllipseTool.cpp @@ -132,59 +132,59 @@ ErrorOr EllipseTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto thickness_container = TRY(properties_widget->try_add()); - thickness_container->set_fixed_height(20); - thickness_container->set_layout(); + auto& thickness_container = properties_widget->add(); + thickness_container.set_fixed_height(20); + thickness_container.set_layout(); - auto thickness_label = TRY(thickness_container->try_add("Thickness:"_string)); - thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - thickness_label->set_fixed_size(80, 20); + auto& thickness_label = thickness_container.add("Thickness:"_string); + thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + thickness_label.set_fixed_size(80, 20); - auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, "px"_string)); - thickness_slider->set_range(1, 10); - thickness_slider->set_value(m_thickness); + auto& thickness_slider = thickness_container.add(Orientation::Horizontal, "px"_string); + thickness_slider.set_range(1, 10); + thickness_slider.set_value(m_thickness); - thickness_slider->on_change = [this](int value) { + thickness_slider.on_change = [this](int value) { m_thickness = value; }; - set_primary_slider(thickness_slider); + set_primary_slider(&thickness_slider); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(70); - mode_container->set_layout(); - auto mode_label = TRY(mode_container->try_add("Mode:"_string)); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(70); + mode_container.set_layout(); + auto& mode_label = mode_container.add("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); - auto mode_radio_container = TRY(mode_container->try_add()); - mode_radio_container->set_layout(); - auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_string)); - auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_string)); - auto aa_enable_checkbox = TRY(mode_radio_container->try_add("Anti-alias"_string)); + auto& mode_radio_container = mode_container.add(); + mode_radio_container.set_layout(); + auto& outline_mode_radio = mode_radio_container.add("Outline"_string); + auto& fill_mode_radio = mode_radio_container.add("Fill"_string); + auto& aa_enable_checkbox = mode_radio_container.add("Anti-alias"_string); - aa_enable_checkbox->on_checked = [this](bool checked) { + aa_enable_checkbox.on_checked = [this](bool checked) { m_antialias_enabled = checked; }; - outline_mode_radio->on_checked = [this](bool checked) { + outline_mode_radio.on_checked = [this](bool checked) { if (checked) m_fill_mode = FillMode::Outline; }; - fill_mode_radio->on_checked = [this](bool checked) { + fill_mode_radio.on_checked = [this](bool checked) { if (checked) m_fill_mode = FillMode::Fill; }; - aa_enable_checkbox->set_checked(true); - outline_mode_radio->set_checked(true); + aa_enable_checkbox.set_checked(true); + outline_mode_radio.set_checked(true); - auto aspect_container = TRY(properties_widget->try_add()); - aspect_container->set_fixed_height(20); - aspect_container->set_layout(); + auto& aspect_container = properties_widget->add(); + aspect_container.set_fixed_height(20); + aspect_container.set_layout(); - auto aspect_label = TRY(aspect_container->try_add("Aspect Ratio:"_string)); - aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - aspect_label->set_fixed_size(80, 20); + auto& aspect_label = aspect_container.add("Aspect Ratio:"_string); + aspect_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + aspect_label.set_fixed_size(80, 20); - m_aspect_w_textbox = TRY(aspect_container->try_add()); + m_aspect_w_textbox = aspect_container.add(); m_aspect_w_textbox->set_fixed_height(20); m_aspect_w_textbox->set_fixed_width(25); m_aspect_w_textbox->on_change = [this] { @@ -197,11 +197,11 @@ ErrorOr EllipseTool::get_properties_widget() } }; - auto multiply_label = TRY(aspect_container->try_add("x"_string)); - multiply_label->set_text_alignment(Gfx::TextAlignment::Center); - multiply_label->set_fixed_size(10, 20); + auto& multiply_label = aspect_container.add("x"_string); + multiply_label.set_text_alignment(Gfx::TextAlignment::Center); + multiply_label.set_fixed_size(10, 20); - m_aspect_h_textbox = TRY(aspect_container->try_add()); + m_aspect_h_textbox = aspect_container.add(); m_aspect_h_textbox->set_fixed_height(20); m_aspect_h_textbox->set_fixed_width(25); m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); }; diff --git a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp index e66b75c2d1..1d5d9af936 100644 --- a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp @@ -60,78 +60,78 @@ ErrorOr EraseTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto size_container = TRY(properties_widget->try_add()); - size_container->set_fixed_height(20); - size_container->set_layout(); + auto& size_container = properties_widget->add(); + size_container.set_fixed_height(20); + size_container.set_layout(); - auto size_label = TRY(size_container->try_add("Size:"_string)); - size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - size_label->set_fixed_size(80, 20); + auto& size_label = size_container.add("Size:"_string); + size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + size_label.set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); - size_slider->set_range(1, 250); - size_slider->set_value(size()); + auto& size_slider = size_container.add(Orientation::Horizontal, "px"_string); + size_slider.set_range(1, 250); + 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); - 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()); - hardness_container->set_fixed_height(20); - hardness_container->set_layout(); + auto& hardness_container = properties_widget->add(); + hardness_container.set_fixed_height(20); + hardness_container.set_layout(); - auto hardness_label = TRY(hardness_container->try_add("Hardness:"_string)); - hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - hardness_label->set_fixed_size(80, 20); + auto& hardness_label = hardness_container.add("Hardness:"_string); + hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + hardness_label.set_fixed_size(80, 20); - auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_string)); - hardness_slider->set_range(1, 100); - hardness_slider->set_value(hardness()); + auto& hardness_slider = hardness_container.add(Orientation::Horizontal, "%"_string); + hardness_slider.set_range(1, 100); + hardness_slider.set_value(hardness()); - hardness_slider->on_change = [this](int value) { + hardness_slider.on_change = [this](int value) { set_hardness(value); }; - set_secondary_slider(hardness_slider); + set_secondary_slider(&hardness_slider); - auto secondary_color_container = TRY(properties_widget->try_add()); - secondary_color_container->set_fixed_height(20); - secondary_color_container->set_layout(); + auto& secondary_color_container = properties_widget->add(); + secondary_color_container.set_fixed_height(20); + secondary_color_container.set_layout(); - auto use_secondary_color_checkbox = TRY(secondary_color_container->try_add()); - use_secondary_color_checkbox->set_checked(m_use_secondary_color); - use_secondary_color_checkbox->set_text("Use secondary color"_string); - use_secondary_color_checkbox->on_checked = [this](bool checked) { + auto& use_secondary_color_checkbox = secondary_color_container.add(); + use_secondary_color_checkbox.set_checked(m_use_secondary_color); + use_secondary_color_checkbox.set_text("Use secondary color"_string); + use_secondary_color_checkbox.on_checked = [this](bool checked) { m_use_secondary_color = checked; }; - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(46); - mode_container->set_layout(); - auto mode_label = TRY(mode_container->try_add("Draw Mode:"_string)); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(80, 20); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(46); + mode_container.set_layout(); + auto& mode_label = mode_container.add("Draw Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(80, 20); - auto mode_radio_container = TRY(mode_container->try_add()); - mode_radio_container->set_layout(); - auto pencil_mode_radio = TRY(mode_radio_container->try_add("Pencil"_string)); - auto brush_mode_radio = TRY(mode_radio_container->try_add("Brush"_string)); + auto& mode_radio_container = mode_container.add(); + mode_radio_container.set_layout(); + auto& pencil_mode_radio = mode_radio_container.add("Pencil"_string); + auto& brush_mode_radio = mode_radio_container.add("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; - hardness_slider->set_enabled(false); + hardness_slider.set_enabled(false); 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; - hardness_slider->set_enabled(true); + hardness_slider.set_enabled(true); 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; } diff --git a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp index 8b4f6c1a22..971eb377fb 100644 --- a/Userland/Applications/PixelPaint/Tools/GradientTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GradientTool.cpp @@ -204,12 +204,12 @@ ErrorOr GradientTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(20); - mode_container->set_layout(); - auto mode_label = TRY(mode_container->try_add("Gradient Type:"_string)); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(80, 20); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(20); + mode_container.set_layout(); + auto& mode_label = mode_container.add("Gradient Type:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(80, 20); static constexpr auto s_mode_names = [] { Array names; @@ -228,36 +228,36 @@ ErrorOr GradientTool::get_properties_widget() return names; }(); - auto mode_combobox = TRY(mode_container->try_add()); - mode_combobox->set_only_allow_values_from_model(true); - mode_combobox->set_model(*GUI::ItemListModel::create(s_mode_names)); - mode_combobox->set_selected_index((int)m_mode, GUI::AllowCallback::No); + auto& mode_combobox = mode_container.add(); + mode_combobox.set_only_allow_values_from_model(true); + mode_combobox.set_model(*GUI::ItemListModel::create(s_mode_names)); + mode_combobox.set_selected_index((int)m_mode, GUI::AllowCallback::No); - auto opacity_container = TRY(properties_widget->try_add()); - opacity_container->set_fixed_height(20); - opacity_container->set_layout(); + auto& opacity_container = properties_widget->add(); + opacity_container.set_fixed_height(20); + opacity_container.set_layout(); - auto opacity_label = TRY(opacity_container->try_add("Opacity:"_string)); - opacity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - opacity_label->set_fixed_size(80, 20); + auto& opacity_label = opacity_container.add("Opacity:"_string); + opacity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + opacity_label.set_fixed_size(80, 20); - auto opacity_slider = TRY(opacity_container->try_add()); - opacity_slider->set_range(1, 100); - opacity_slider->set_value(100); + auto& opacity_slider = opacity_container.add(); + opacity_slider.set_range(1, 100); + opacity_slider.set_value(100); - opacity_slider->on_change = [this](int value) { + opacity_slider.on_change = [this](int value) { m_opacity = value; m_editor->update(); }; - set_primary_slider(opacity_slider); + set_primary_slider(&opacity_slider); - auto hardness_container = TRY(properties_widget->try_add()); - hardness_container->set_layout(); - hardness_container->set_fixed_height(20); - hardness_container->set_visible(m_mode == GradientMode::Radial); + auto& hardness_container = properties_widget->add(); + hardness_container.set_layout(); + hardness_container.set_fixed_height(20); + 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() < (int)GradientMode::__Count); @@ -268,37 +268,37 @@ ErrorOr GradientTool::get_properties_widget() 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("Hardness:"_string)); - hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - hardness_label->set_fixed_size(80, 20); + auto& hardness_label = hardness_container.add("Hardness:"_string); + hardness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + hardness_label.set_fixed_size(80, 20); - auto hardness_slider = TRY(hardness_container->try_add(Orientation::Horizontal, "%"_string)); - hardness_slider->set_range(1, 99); - hardness_slider->set_value(m_hardness); - hardness_slider->on_change = [this](int value) { + auto& hardness_slider = hardness_container.add(Orientation::Horizontal, "%"_string); + hardness_slider.set_range(1, 99); + hardness_slider.set_value(m_hardness); + hardness_slider.on_change = [this](int value) { if (m_mode == GradientMode::Radial && m_editor) { m_hardness = value; m_editor->update(); } }; - set_secondary_slider(hardness_slider); + set_secondary_slider(&hardness_slider); - auto use_secondary_color_checkbox = TRY(properties_widget->try_add("Use secondary color"_string)); - use_secondary_color_checkbox->on_checked = [this](bool checked) { + auto& use_secondary_color_checkbox = properties_widget->add("Use secondary color"_string); + use_secondary_color_checkbox.on_checked = [this](bool checked) { m_use_secondary_color = checked; m_editor->update(); }; - auto button_container = TRY(properties_widget->try_add()); - button_container->set_fixed_height(22); - button_container->set_layout(); - button_container->add_spacer(); + auto& button_container = properties_widget->add(); + button_container.set_fixed_height(22); + button_container.set_layout(); + button_container.add_spacer(); - auto apply_button = TRY(button_container->try_add("Apply"_string)); - apply_button->on_click = [this](auto) { + auto& apply_button = button_container.add("Apply"_string); + apply_button.on_click = [this](auto) { rasterize_gradient(); }; m_properties_widget = properties_widget; diff --git a/Userland/Applications/PixelPaint/Tools/GuideTool.cpp b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp index efce3a9340..10ca16410b 100644 --- a/Userland/Applications/PixelPaint/Tools/GuideTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/GuideTool.cpp @@ -182,23 +182,23 @@ ErrorOr GuideTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto snapping_container = TRY(properties_widget->try_add()); - snapping_container->set_fixed_height(20); - snapping_container->set_layout(); + auto& snapping_container = properties_widget->add(); + snapping_container.set_fixed_height(20); + snapping_container.set_layout(); - auto snapping_label = TRY(snapping_container->try_add("Snap offset:"_string)); - snapping_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - snapping_label->set_fixed_size(80, 20); - snapping_label->set_tooltip_deprecated("Press Shift to snap"); + auto& snapping_label = snapping_container.add("Snap offset:"_string); + snapping_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + snapping_label.set_fixed_size(80, 20); + snapping_label.set_tooltip_deprecated("Press Shift to snap"); - auto snapping_slider = TRY(snapping_container->try_add(Orientation::Horizontal, "px"_string)); - snapping_slider->set_range(0, 50); - snapping_slider->set_value(m_snap_size); + auto& snapping_slider = snapping_container.add(Orientation::Horizontal, "px"_string); + snapping_slider.set_range(0, 50); + 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; }; - set_primary_slider(snapping_slider); + set_primary_slider(&snapping_slider); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp index 45d86ea9a7..2363fd488f 100644 --- a/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/LassoSelectTool.cpp @@ -163,14 +163,14 @@ ErrorOr LassoSelectTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(20); - mode_container->set_layout(); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(20); + mode_container.set_layout(); - auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_string); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(80, 20); + auto& mode_label = mode_container.add(); + mode_label.set_text("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(80, 20); static constexpr auto s_merge_mode_names = [] { Array names; @@ -195,11 +195,11 @@ ErrorOr LassoSelectTool::get_properties_widget() return names; }(); - auto mode_combo = TRY(mode_container->try_add()); - mode_combo->set_only_allow_values_from_model(true); - mode_combo->set_model(*GUI::ItemListModel::create(s_merge_mode_names)); - mode_combo->set_selected_index((int)m_merge_mode); - mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { + auto& mode_combo = mode_container.add(); + mode_combo.set_only_allow_values_from_model(true); + mode_combo.set_model(*GUI::ItemListModel::create(s_merge_mode_names)); + mode_combo.set_selected_index((int)m_merge_mode); + mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) { VERIFY(index.row() >= 0); VERIFY(index.row() < (int)Selection::MergeMode::__Count); diff --git a/Userland/Applications/PixelPaint/Tools/LineTool.cpp b/Userland/Applications/PixelPaint/Tools/LineTool.cpp index 461c9a6162..688b1b63ae 100644 --- a/Userland/Applications/PixelPaint/Tools/LineTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/LineTool.cpp @@ -125,36 +125,36 @@ ErrorOr LineTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto thickness_container = TRY(properties_widget->try_add()); - thickness_container->set_fixed_height(20); - thickness_container->set_layout(); + auto& thickness_container = properties_widget->add(); + thickness_container.set_fixed_height(20); + thickness_container.set_layout(); - auto thickness_label = TRY(thickness_container->try_add("Thickness:"_string)); - thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - thickness_label->set_fixed_size(80, 20); + auto& thickness_label = thickness_container.add("Thickness:"_string); + thickness_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + thickness_label.set_fixed_size(80, 20); - auto thickness_slider = TRY(thickness_container->try_add(Orientation::Horizontal, "px"_string)); - thickness_slider->set_range(1, 10); - thickness_slider->set_value(m_thickness); + auto& thickness_slider = thickness_container.add(Orientation::Horizontal, "px"_string); + thickness_slider.set_range(1, 10); + thickness_slider.set_value(m_thickness); - thickness_slider->on_change = [this](int value) { + thickness_slider.on_change = [this](int value) { m_thickness = value; }; - set_primary_slider(thickness_slider); + set_primary_slider(&thickness_slider); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(20); - mode_container->set_layout(); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(20); + mode_container.set_layout(); - auto mode_label = TRY(mode_container->try_add("Mode:"_string)); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(80, 20); + auto& mode_label = mode_container.add("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(80, 20); - auto aa_enable_checkbox = TRY(mode_container->try_add("Anti-alias"_string)); - aa_enable_checkbox->on_checked = [this](bool checked) { + auto& aa_enable_checkbox = mode_container.add("Anti-alias"_string); + aa_enable_checkbox.on_checked = [this](bool checked) { m_antialias_enabled = checked; }; - aa_enable_checkbox->set_checked(true); + aa_enable_checkbox.set_checked(true); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/PixelPaint/Tools/MoveTool.cpp b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp index 890a1bb6bb..d5c2b33167 100644 --- a/Userland/Applications/PixelPaint/Tools/MoveTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/MoveTool.cpp @@ -295,18 +295,18 @@ ErrorOr MoveTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto selection_mode_container = TRY(properties_widget->try_add()); - selection_mode_container->set_layout(); - selection_mode_container->set_fixed_height(46); - auto selection_mode_label = TRY(selection_mode_container->try_add("Selection Mode:"_string)); - selection_mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - selection_mode_label->set_fixed_size(80, 40); + auto& selection_mode_container = properties_widget->add(); + selection_mode_container.set_layout(); + selection_mode_container.set_fixed_height(46); + auto& selection_mode_label = selection_mode_container.add("Selection Mode:"_string); + selection_mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + selection_mode_label.set_fixed_size(80, 40); - auto mode_radio_container = TRY(selection_mode_container->try_add()); - mode_radio_container->set_layout(); - m_selection_mode_foreground = TRY(mode_radio_container->try_add("Foreground"_string)); + auto& mode_radio_container = selection_mode_container.add(); + mode_radio_container.set_layout(); + m_selection_mode_foreground = mode_radio_container.add("Foreground"_string); - m_selection_mode_active = TRY(mode_radio_container->try_add("Active Layer"_string)); + m_selection_mode_active = mode_radio_container.add("Active Layer"_string); m_selection_mode_foreground->on_checked = [this](bool) { m_layer_selection_mode = LayerSelectionMode::ForegroundLayer; diff --git a/Userland/Applications/PixelPaint/Tools/PenTool.cpp b/Userland/Applications/PixelPaint/Tools/PenTool.cpp index 738940b6aa..3981d23b71 100644 --- a/Userland/Applications/PixelPaint/Tools/PenTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PenTool.cpp @@ -41,22 +41,22 @@ ErrorOr PenTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto size_container = TRY(properties_widget->try_add()); - size_container->set_fixed_height(20); - size_container->set_layout(); + auto& size_container = properties_widget->add(); + size_container.set_fixed_height(20); + size_container.set_layout(); - auto size_label = TRY(size_container->try_add("Thickness:"_string)); - size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - size_label->set_fixed_size(80, 20); + auto& size_label = size_container.add("Thickness:"_string); + size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + size_label.set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); - size_slider->set_range(1, 20); - size_slider->set_value(size()); + auto& size_slider = size_container.add(Orientation::Horizontal, "px"_string); + size_slider.set_range(1, 20); + size_slider.set_value(size()); - size_slider->on_change = [this](int value) { + size_slider.on_change = [this](int value) { set_size(value); }; - set_primary_slider(size_slider); + set_primary_slider(&size_slider); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/PixelPaint/Tools/PickerTool.cpp b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp index f51bf23f62..eb198a12e1 100644 --- a/Userland/Applications/PixelPaint/Tools/PickerTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PickerTool.cpp @@ -47,9 +47,9 @@ ErrorOr PickerTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto sample_checkbox = TRY(properties_widget->try_add("Sample all layers"_string)); - sample_checkbox->set_checked(m_sample_all_layers); - sample_checkbox->on_checked = [this](bool value) { + auto& sample_checkbox = properties_widget->add("Sample all layers"_string); + sample_checkbox.set_checked(m_sample_all_layers); + sample_checkbox.on_checked = [this](bool value) { m_sample_all_layers = value; }; m_properties_widget = properties_widget; diff --git a/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp index 1690a006b9..94019cd91a 100644 --- a/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/PolygonalSelectTool.cpp @@ -192,14 +192,14 @@ ErrorOr PolygonalSelectTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(20); - mode_container->set_layout(); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(20); + mode_container.set_layout(); - auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_string); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(80, 20); + auto& mode_label = mode_container.add(); + mode_label.set_text("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(80, 20); static constexpr auto s_merge_mode_names = [] { Array names; @@ -224,11 +224,11 @@ ErrorOr PolygonalSelectTool::get_properties_widget() return names; }(); - auto mode_combo = TRY(mode_container->try_add()); - mode_combo->set_only_allow_values_from_model(true); - mode_combo->set_model(*GUI::ItemListModel::create(s_merge_mode_names)); - mode_combo->set_selected_index((int)m_merge_mode); - mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { + auto& mode_combo = mode_container.add(); + mode_combo.set_only_allow_values_from_model(true); + mode_combo.set_model(*GUI::ItemListModel::create(s_merge_mode_names)); + mode_combo.set_selected_index((int)m_merge_mode); + mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) { VERIFY(index.row() >= 0); VERIFY(index.row() < (int)Selection::MergeMode::__Count); diff --git a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp index 2b775bb5ae..ce22af2635 100644 --- a/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/RectangleSelectTool.cpp @@ -160,33 +160,33 @@ ErrorOr RectangleSelectTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto feather_container = TRY(properties_widget->try_add()); - feather_container->set_fixed_height(20); - feather_container->set_layout(); + auto& feather_container = properties_widget->add(); + feather_container.set_fixed_height(20); + feather_container.set_layout(); - auto feather_label = TRY(feather_container->try_add()); - feather_label->set_text("Feather:"_string); - feather_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - feather_label->set_fixed_size(80, 20); + auto& feather_label = feather_container.add(); + feather_label.set_text("Feather:"_string); + feather_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + feather_label.set_fixed_size(80, 20); int const feather_slider_max = 100; - auto feather_slider = TRY(feather_container->try_add(Orientation::Horizontal, "%"_string)); - feather_slider->set_range(0, feather_slider_max); - feather_slider->set_value((int)floorf(m_edge_feathering * (float)feather_slider_max)); + auto& feather_slider = feather_container.add(Orientation::Horizontal, "%"_string); + feather_slider.set_range(0, 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; }; - set_primary_slider(feather_slider); + set_primary_slider(&feather_slider); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(20); - mode_container->set_layout(); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(20); + mode_container.set_layout(); - auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_string); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(80, 20); + auto& mode_label = mode_container.add(); + mode_label.set_text("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(80, 20); for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) { switch ((Selection::MergeMode)i) { @@ -207,11 +207,11 @@ ErrorOr RectangleSelectTool::get_properties_widget() } } - auto mode_combo = TRY(mode_container->try_add()); - mode_combo->set_only_allow_values_from_model(true); - mode_combo->set_model(*GUI::ItemListModel::create(m_merge_mode_names)); - mode_combo->set_selected_index((int)m_merge_mode); - mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { + auto& mode_combo = mode_container.add(); + mode_combo.set_only_allow_values_from_model(true); + mode_combo.set_model(*GUI::ItemListModel::create(m_merge_mode_names)); + mode_combo.set_selected_index((int)m_merge_mode); + mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) { VERIFY(index.row() >= 0); VERIFY(index.row() < (int)Selection::MergeMode::__Count); diff --git a/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp index 09ee0741ae..7353d2bad6 100644 --- a/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/RectangleTool.cpp @@ -146,28 +146,28 @@ ErrorOr RectangleTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto thickness_or_radius_container = TRY(properties_widget->try_add()); - thickness_or_radius_container->set_fixed_height(20); - thickness_or_radius_container->set_layout(); + auto& thickness_or_radius_container = properties_widget->add(); + thickness_or_radius_container.set_fixed_height(20); + thickness_or_radius_container.set_layout(); - auto thickness_or_radius_label = TRY(thickness_or_radius_container->try_add()); - thickness_or_radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - thickness_or_radius_label->set_fixed_size(80, 20); + auto& thickness_or_radius_label = thickness_or_radius_container.add(); + thickness_or_radius_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + thickness_or_radius_label.set_fixed_size(80, 20); - auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add(Orientation::Horizontal, "px"_string)); + auto& thickness_or_radius_slider = thickness_or_radius_container.add(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) { m_corner_radius = value; } else 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) { - 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_value(value); + 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_value(value); }; if (m_fill_mode == FillMode::RoundedCorners) update_values("Radius:"sv, m_corner_radius, 0, 50); @@ -176,64 +176,64 @@ ErrorOr RectangleTool::get_properties_widget() }; update_slider(); - set_primary_slider(thickness_or_radius_slider); + set_primary_slider(&thickness_or_radius_slider); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(90); - mode_container->set_layout(); - auto mode_label = TRY(mode_container->try_add("Mode:"_string)); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(30, 20); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(90); + mode_container.set_layout(); + auto& mode_label = mode_container.add("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(30, 20); - auto mode_radio_container = TRY(mode_container->try_add()); - mode_radio_container->set_layout(); - auto outline_mode_radio = TRY(mode_radio_container->try_add("Outline"_string)); - auto fill_mode_radio = TRY(mode_radio_container->try_add("Fill"_string)); - auto gradient_mode_radio = TRY(mode_radio_container->try_add("Gradient"_string)); - mode_radio_container->set_fixed_width(70); + auto& mode_radio_container = mode_container.add(); + mode_radio_container.set_layout(); + auto& outline_mode_radio = mode_radio_container.add("Outline"_string); + auto& fill_mode_radio = mode_radio_container.add("Fill"_string); + auto& gradient_mode_radio = mode_radio_container.add("Gradient"_string); + mode_radio_container.set_fixed_width(70); - auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add("Rounded"_string)); + auto& rounded_corners_mode_radio = mode_radio_container.add("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; 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; 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; 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; update_slider(); }; - outline_mode_radio->set_checked(true); + outline_mode_radio.set_checked(true); - auto mode_extras_container = TRY(mode_container->try_add()); - mode_extras_container->set_layout(); + auto& mode_extras_container = mode_container.add(); + mode_extras_container.set_layout(); - auto aa_enable_checkbox = TRY(mode_extras_container->try_add("Anti-alias"_string)); - aa_enable_checkbox->on_checked = [this](bool checked) { + auto& aa_enable_checkbox = mode_extras_container.add("Anti-alias"_string); + aa_enable_checkbox.on_checked = [this](bool 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()); - aspect_container->set_layout(); - aspect_container->set_fixed_width(75); + auto& aspect_container = mode_extras_container.add(); + aspect_container.set_layout(); + aspect_container.set_fixed_width(75); - auto aspect_label = TRY(aspect_container->try_add("Aspect Ratio:"_string)); - aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - aspect_label->set_fixed_size(75, 20); + auto& aspect_label = aspect_container.add("Aspect Ratio:"_string); + aspect_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + aspect_label.set_fixed_size(75, 20); - auto aspect_fields_container = TRY(aspect_container->try_add()); - aspect_fields_container->set_fixed_width(75); - aspect_fields_container->set_layout(); + auto& aspect_fields_container = aspect_container.add(); + aspect_fields_container.set_fixed_width(75); + aspect_fields_container.set_layout(); - m_aspect_w_textbox = TRY(aspect_fields_container->try_add()); + m_aspect_w_textbox = aspect_fields_container.add(); m_aspect_w_textbox->set_fixed_height(20); m_aspect_w_textbox->set_fixed_width(25); m_aspect_w_textbox->on_change = [this] { @@ -246,11 +246,11 @@ ErrorOr RectangleTool::get_properties_widget() } }; - auto multiply_label = TRY(aspect_fields_container->try_add("x"_string)); - multiply_label->set_text_alignment(Gfx::TextAlignment::Center); - multiply_label->set_fixed_size(10, 20); + auto& multiply_label = aspect_fields_container.add("x"_string); + multiply_label.set_text_alignment(Gfx::TextAlignment::Center); + multiply_label.set_fixed_size(10, 20); - m_aspect_h_textbox = TRY(aspect_fields_container->try_add()); + m_aspect_h_textbox = aspect_fields_container.add(); m_aspect_h_textbox->set_fixed_height(20); m_aspect_h_textbox->set_fixed_width(25); m_aspect_h_textbox->on_change = [this] { m_aspect_w_textbox->on_change(); }; diff --git a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp index 410c0724b2..71db516f25 100644 --- a/Userland/Applications/PixelPaint/Tools/SprayTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/SprayTool.cpp @@ -96,39 +96,39 @@ ErrorOr SprayTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto size_container = TRY(properties_widget->try_add()); - size_container->set_fixed_height(20); - size_container->set_layout(); + auto& size_container = properties_widget->add(); + size_container.set_fixed_height(20); + size_container.set_layout(); - auto size_label = TRY(size_container->try_add("Size:"_string)); - size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - size_label->set_fixed_size(80, 20); + auto& size_label = size_container.add("Size:"_string); + size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + size_label.set_fixed_size(80, 20); - auto size_slider = TRY(size_container->try_add(Orientation::Horizontal, "px"_string)); - size_slider->set_range(1, 20); - size_slider->set_value(m_thickness); + auto& size_slider = size_container.add(Orientation::Horizontal, "px"_string); + size_slider.set_range(1, 20); + size_slider.set_value(m_thickness); - size_slider->on_change = [this](int value) { + size_slider.on_change = [this](int value) { m_thickness = value; }; - set_primary_slider(size_slider); + set_primary_slider(&size_slider); - auto density_container = TRY(properties_widget->try_add()); - density_container->set_fixed_height(20); - density_container->set_layout(); + auto& density_container = properties_widget->add(); + density_container.set_fixed_height(20); + density_container.set_layout(); - auto density_label = TRY(density_container->try_add("Density:"_string)); - density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - density_label->set_fixed_size(80, 20); + auto& density_label = density_container.add("Density:"_string); + density_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + density_label.set_fixed_size(80, 20); - auto density_slider = TRY(density_container->try_add(Orientation::Horizontal, "%"_string)); - density_slider->set_range(1, 100); - density_slider->set_value(m_density); + auto& density_slider = density_container.add(Orientation::Horizontal, "%"_string); + density_slider.set_range(1, 100); + density_slider.set_value(m_density); - density_slider->on_change = [this](int value) { + density_slider.on_change = [this](int value) { m_density = value; }; - set_secondary_slider(density_slider); + set_secondary_slider(&density_slider); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/PixelPaint/Tools/TextTool.cpp b/Userland/Applications/PixelPaint/Tools/TextTool.cpp index 4b38b2e9b7..4c274b9765 100644 --- a/Userland/Applications/PixelPaint/Tools/TextTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/TextTool.cpp @@ -111,13 +111,13 @@ ErrorOr TextTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto font_header = TRY(properties_widget->try_add("Current Font:"_string)); - font_header->set_text_alignment(Gfx::TextAlignment::CenterLeft); + auto& font_header = properties_widget->add("Current Font:"_string); + font_header.set_text_alignment(Gfx::TextAlignment::CenterLeft); - m_font_label = TRY(properties_widget->try_add(m_selected_font->human_readable_name())); + m_font_label = properties_widget->add(m_selected_font->human_readable_name()); - auto change_font_button = TRY(properties_widget->try_add("Change Font..."_string)); - change_font_button->on_click = [this](auto) { + auto& change_font_button = properties_widget->add("Change Font..."_string); + change_font_button.on_click = [this](auto) { auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false); if (picker->exec() == GUI::Dialog::ExecResult::OK) { m_font_label->set_text(picker->font()->human_readable_name()); diff --git a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp index fb6a302b4b..7ba50c51e4 100644 --- a/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/WandSelectTool.cpp @@ -75,31 +75,31 @@ ErrorOr WandSelectTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto threshold_container = TRY(properties_widget->try_add()); - threshold_container->set_fixed_height(20); - threshold_container->set_layout(); + auto& threshold_container = properties_widget->add(); + threshold_container.set_fixed_height(20); + threshold_container.set_layout(); - auto threshold_label = TRY(threshold_container->try_add("Threshold:"_string)); - threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - threshold_label->set_fixed_size(80, 20); + auto& threshold_label = threshold_container.add("Threshold:"_string); + threshold_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + threshold_label.set_fixed_size(80, 20); - auto threshold_slider = TRY(threshold_container->try_add(Orientation::Horizontal, "%"_string)); - threshold_slider->set_range(0, 100); - threshold_slider->set_value(m_threshold); + auto& threshold_slider = threshold_container.add(Orientation::Horizontal, "%"_string); + threshold_slider.set_range(0, 100); + threshold_slider.set_value(m_threshold); - threshold_slider->on_change = [this](int value) { + threshold_slider.on_change = [this](int value) { m_threshold = value; }; - set_primary_slider(threshold_slider); + set_primary_slider(&threshold_slider); - auto mode_container = TRY(properties_widget->try_add()); - mode_container->set_fixed_height(20); - mode_container->set_layout(); + auto& mode_container = properties_widget->add(); + mode_container.set_fixed_height(20); + mode_container.set_layout(); - auto mode_label = TRY(mode_container->try_add()); - mode_label->set_text("Mode:"_string); - mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - mode_label->set_fixed_size(80, 20); + auto& mode_label = mode_container.add(); + mode_label.set_text("Mode:"_string); + mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + mode_label.set_fixed_size(80, 20); for (int i = 0; i < (int)Selection::MergeMode::__Count; i++) { switch ((Selection::MergeMode)i) { @@ -120,11 +120,11 @@ ErrorOr WandSelectTool::get_properties_widget() } } - auto mode_combo = TRY(mode_container->try_add()); - mode_combo->set_only_allow_values_from_model(true); - mode_combo->set_model(*GUI::ItemListModel::create(m_merge_mode_names)); - mode_combo->set_selected_index((int)m_merge_mode); - mode_combo->on_change = [this](auto&&, GUI::ModelIndex const& index) { + auto& mode_combo = mode_container.add(); + mode_combo.set_only_allow_values_from_model(true); + mode_combo.set_model(*GUI::ItemListModel::create(m_merge_mode_names)); + mode_combo.set_selected_index((int)m_merge_mode); + mode_combo.on_change = [this](auto&&, GUI::ModelIndex const& index) { VERIFY(index.row() >= 0); VERIFY(index.row() < (int)Selection::MergeMode::__Count); diff --git a/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp index 5ec4506146..9354407d5e 100644 --- a/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/ZoomTool.cpp @@ -29,22 +29,22 @@ ErrorOr ZoomTool::get_properties_widget() auto properties_widget = GUI::Widget::construct(); properties_widget->set_layout(); - auto sensitivity_container = TRY(properties_widget->try_add()); - sensitivity_container->set_fixed_height(20); - sensitivity_container->set_layout(); + auto& sensitivity_container = properties_widget->add(); + sensitivity_container.set_fixed_height(20); + sensitivity_container.set_layout(); - auto sensitivity_label = TRY(sensitivity_container->try_add("Sensitivity:"_string)); - sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); - sensitivity_label->set_fixed_size(80, 20); + auto& sensitivity_label = sensitivity_container.add("Sensitivity:"_string); + sensitivity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + sensitivity_label.set_fixed_size(80, 20); - auto sensitivity_slider = TRY(sensitivity_container->try_add(Orientation::Horizontal, "%"_string)); - sensitivity_slider->set_range(1, 100); - sensitivity_slider->set_value(100 * m_sensitivity); + auto& sensitivity_slider = sensitivity_container.add(Orientation::Horizontal, "%"_string); + sensitivity_slider.set_range(1, 100); + 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; }; - set_primary_slider(sensitivity_slider); + set_primary_slider(&sensitivity_slider); m_properties_widget = properties_widget; } diff --git a/Userland/Applications/Settings/main.cpp b/Userland/Applications/Settings/main.cpp index 45eaa99a0f..c53a052f38 100644 --- a/Userland/Applications/Settings/main.cpp +++ b/Userland/Applications/Settings/main.cpp @@ -105,16 +105,16 @@ ErrorOr serenity_main(Main::Arguments arguments) main_widget->set_fill_with_background_color(true); main_widget->set_layout(); - auto icon_view = TRY(main_widget->try_add()); - icon_view->set_should_hide_unnecessary_scrollbars(true); + auto& icon_view = main_widget->add(); + icon_view.set_should_hide_unnecessary_scrollbars(true); 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 requires_root = model->data(index, static_cast(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); if (requires_root) @@ -123,17 +123,17 @@ ErrorOr serenity_main(Main::Arguments arguments) GUI::Process::spawn_or_show_error(window, executable); }; - auto statusbar = TRY(main_widget->try_add()); + auto& statusbar = main_widget->add(); - icon_view->on_selection_change = [&] { - auto index = icon_view->selection().first(); + icon_view.on_selection_change = [&] { + auto index = icon_view.selection().first(); if (!index.is_valid()) { - statusbar->set_text({}); + statusbar.set_text({}); return; } auto& app = *(NonnullRefPtr*)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)); diff --git a/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp b/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp index c36ddd8e4a..a97ad229d9 100644 --- a/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp +++ b/Userland/Applications/SpaceAnalyzer/ProgressWindow.cpp @@ -18,10 +18,10 @@ ErrorOr> ProgressWindow::try_create(StringView tit main_widget->set_fill_with_background_color(true); main_widget->set_layout(); - auto label = TRY(main_widget->try_add("Analyzing storage space..."_string)); - label->set_fixed_height(22); + auto& label = main_widget->add("Analyzing storage space..."_string); + label.set_fixed_height(22); - window->m_progress_label = TRY(main_widget->try_add()); + window->m_progress_label = main_widget->add(); window->m_progress_label->set_fixed_height(22); window->update_progress_label(0); diff --git a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp index 6619aa8921..7d50edc8d1 100644 --- a/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessFileDescriptorMapWidget.cpp @@ -19,7 +19,7 @@ ErrorOr> ProcessFileDescriptorMapW { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessFileDescriptorMapWidget())); widget->set_layout(4); - widget->m_table_view = TRY(widget->try_add()); + widget->m_table_view = widget->add(); Vector pid_fds_fields; TRY(pid_fds_fields.try_empend("fd", "FD"_string, Gfx::TextAlignment::CenterRight)); diff --git a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp index 9fd727f65c..d787760df7 100644 --- a/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessMemoryMapWidget.cpp @@ -53,7 +53,7 @@ ErrorOr> ProcessMemoryMapWidget::try_creat { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessMemoryMapWidget())); widget->set_layout(4); - widget->m_table_view = TRY(widget->try_add()); + widget->m_table_view = widget->add(); Vector pid_vm_fields; TRY(pid_vm_fields.try_empend( @@ -110,7 +110,7 @@ ErrorOr> ProcessMemoryMapWidget::try_creat widget->m_table_view->set_column_painting_delegate(7, TRY(try_make())); widget->m_table_view->set_key_column_and_sort_order(0, GUI::SortOrder::Ascending); - widget->m_timer = TRY(widget->try_add(1000, [widget] { widget->refresh(); })); + widget->m_timer = widget->add(1000, [widget] { widget->refresh(); }); widget->m_timer->start(); return widget; diff --git a/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp b/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp index feef225818..2eac9a3665 100644 --- a/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessStateWidget.cpp @@ -97,7 +97,7 @@ ErrorOr> ProcessStateWidget::try_create() { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessStateWidget())); widget->set_layout(4); - widget->m_table_view = TRY(widget->try_add()); + widget->m_table_view = widget->add(); widget->m_table_view->set_model(TRY(try_make_ref_counted(ProcessModel::the(), 0))); widget->m_table_view->column_header().set_visible(false); widget->m_table_view->column_header().set_section_size(0, 90); diff --git a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp index 521a879708..bef2f50fdd 100644 --- a/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp +++ b/Userland/Applications/SystemMonitor/ProcessUnveiledPathsWidget.cpp @@ -20,7 +20,7 @@ ErrorOr> ProcessUnveiledPathsWidget::t { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ProcessUnveiledPathsWidget())); widget->set_layout(4); - widget->m_table_view = TRY(widget->try_add()); + widget->m_table_view = widget->add(); Vector pid_unveil_fields; TRY(pid_unveil_fields.try_empend("path", "Path"_string, Gfx::TextAlignment::CenterLeft)); diff --git a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp index 425d4f3bca..4e3c2210c8 100644 --- a/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp +++ b/Userland/Applications/SystemMonitor/ThreadStackWidget.cpp @@ -75,7 +75,7 @@ ErrorOr> ThreadStackWidget::try_create() { auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ThreadStackWidget())); widget->set_layout(4); - widget->m_stack_table = TRY(widget->try_add()); + widget->m_stack_table = widget->add(); widget->m_stack_table->set_model(TRY(try_make_ref_counted())); return widget; } diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp index 4a4536c686..c39b89952b 100644 --- a/Userland/Applications/SystemMonitor/main.cpp +++ b/Userland/Applications/SystemMonitor/main.cpp @@ -332,8 +332,8 @@ ErrorOr serenity_main(Main::Arguments arguments) memory_stats_widget->refresh(); }; update_stats(); - auto refresh_timer = TRY(window->try_add(frequency * 1000, move(update_stats))); - refresh_timer->start(); + auto& refresh_timer = window->add(frequency * 1000, move(update_stats)); + refresh_timer.start(); auto selected_id = [&](ProcessModel::Column column) -> pid_t { if (process_table_view.selection().is_empty()) @@ -454,7 +454,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto make_frequency_action = [&](int seconds) -> ErrorOr { auto action = GUI::Action::create_checkable(DeprecatedString::formatted("&{} Sec", seconds), [&refresh_timer, seconds](auto&) { 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_checked(frequency == seconds); @@ -578,24 +578,24 @@ ErrorOr build_performance_tab(GUI::Widget& graphs_container) Vector cpu_graphs; for (auto row = 0u; row < cpu_graph_rows; ++row) { - auto cpu_graph_row = TRY(cpu_graph_group_box.try_add()); - cpu_graph_row->set_layout(6); - cpu_graph_row->set_fixed_height(108); + auto& cpu_graph_row = cpu_graph_group_box.add(); + cpu_graph_row.set_layout(6); + cpu_graph_row.set_fixed_height(108); for (auto i = 0u; i < cpu_graphs_per_row; ++i) { - auto cpu_graph = TRY(cpu_graph_row->try_add()); - cpu_graph->set_max(100); - cpu_graph->set_value_format(0, { - .graph_color_role = ColorRole::SyntaxPreprocessorStatement, - .text_formatter = [](u64 value) { - return DeprecatedString::formatted("Total: {}%", value); - }, - }); - cpu_graph->set_value_format(1, { - .graph_color_role = ColorRole::SyntaxPreprocessorValue, - .text_formatter = [](u64 value) { - return DeprecatedString::formatted("Kernel: {}%", value); - }, - }); + auto& cpu_graph = cpu_graph_row.add(); + cpu_graph.set_max(100); + cpu_graph.set_value_format(0, { + .graph_color_role = ColorRole::SyntaxPreprocessorStatement, + .text_formatter = [](u64 value) { + return DeprecatedString::formatted("Total: {}%", value); + }, + }); + cpu_graph.set_value_format(1, { + .graph_color_role = ColorRole::SyntaxPreprocessorValue, + .text_formatter = [](u64 value) { + return DeprecatedString::formatted("Kernel: {}%", value); + }, + }); cpu_graphs.append(cpu_graph); } } diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index 155e6d8569..ba32c06f68 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -169,53 +169,53 @@ static ErrorOr> create_find_window(VT::TerminalWidget main_widget->set_background_role(ColorRole::Button); main_widget->set_layout(4); - auto find = TRY(main_widget->try_add()); - find->set_layout(4); - find->set_fixed_height(30); + auto& find = main_widget->add(); + find.set_layout(4); + find.set_fixed_height(30); - auto find_textbox = TRY(find->try_add()); - find_textbox->set_fixed_width(230); - find_textbox->set_focus(true); + auto& find_textbox = find.add(); + find_textbox.set_fixed_width(230); + find_textbox.set_focus(true); if (terminal.has_selection()) - find_textbox->set_text(terminal.selected_text().replace("\n"sv, " "sv, ReplaceMode::All)); - auto find_backwards = TRY(find->try_add()); - find_backwards->set_fixed_width(25); - find_backwards->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png"sv))); - auto find_forwards = TRY(find->try_add()); - find_forwards->set_fixed_width(25); - find_forwards->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/downward-triangle.png"sv))); + find_textbox.set_text(terminal.selected_text().replace("\n"sv, " "sv, ReplaceMode::All)); + auto& find_backwards = find.add(); + find_backwards.set_fixed_width(25); + find_backwards.set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/upward-triangle.png"sv))); + auto& find_forwards = find.add(); + find_forwards.set_fixed_width(25); + 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_backwards->click(); + find_textbox.on_return_pressed = [&find_backwards] { + find_backwards.click(); }; - find_textbox->on_shift_return_pressed = [find_forwards] { - find_forwards->click(); + find_textbox.on_shift_return_pressed = [&find_forwards] { + find_forwards.click(); }; - auto match_case = TRY(main_widget->try_add("Case sensitive"_string)); - auto wrap_around = TRY(main_widget->try_add("Wrap around"_string)); + auto& match_case = main_widget->add("Case sensitive"_string); + auto& wrap_around = main_widget->add("Wrap around"_string); - find_backwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) { - auto needle = find_textbox->text(); + find_backwards.on_click = [&terminal, &find_textbox, &match_case, &wrap_around](auto) { + auto needle = find_textbox.text(); if (needle.is_empty()) { 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()) { terminal.scroll_to_row(found_range.start().row()); terminal.set_selection(found_range); } }; - find_forwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) { - auto needle = find_textbox->text(); + find_forwards.on_click = [&terminal, &find_textbox, &match_case, &wrap_around](auto) { + auto needle = find_textbox.text(); if (needle.is_empty()) { 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()) { terminal.scroll_to_row(found_range.start().row()); diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index 39770d42b5..39d83641bb 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -469,13 +469,13 @@ ErrorOr MainWidget::add_property_tab(PropertyTab const& property_tab) properties_list->set_layout(GUI::Margins { 8 }, 12); for (auto const& group : property_tab.property_groups) { - NonnullRefPtr group_box = TRY(properties_list->try_add(group.title)); + NonnullRefPtr group_box = properties_list->add(group.title); // 1px less on the left makes the text line up with the group title. group_box->set_layout(GUI::Margins { 8, 8, 8, 7 }, 12); group_box->set_preferred_height(GUI::SpecialDimension::Fit); for (auto const& property : group.properties) { - NonnullRefPtr row_widget = TRY(group_box->try_add()); + NonnullRefPtr row_widget = group_box->add(); row_widget->set_fixed_height(22); TRY(property.role.visit( [&](Gfx::AlignmentRole role) -> ErrorOr { diff --git a/Userland/Demos/ModelGallery/GalleryWidget.cpp b/Userland/Demos/ModelGallery/GalleryWidget.cpp index 1aff265d66..55c6002b94 100644 --- a/Userland/Demos/ModelGallery/GalleryWidget.cpp +++ b/Userland/Demos/ModelGallery/GalleryWidget.cpp @@ -15,7 +15,7 @@ GalleryWidget::GalleryWidget() auto& inner_widget = add(); inner_widget.set_layout(4); - m_tab_widget = inner_widget.try_add().release_value_but_fixme_should_propagate_errors(); + m_tab_widget = inner_widget.add(); m_statusbar = add(); (void)load_basic_model_tab(); diff --git a/Userland/Demos/Screensaver/main.cpp b/Userland/Demos/Screensaver/main.cpp index da653165c2..0a462bf842 100644 --- a/Userland/Demos/Screensaver/main.cpp +++ b/Userland/Demos/Screensaver/main.cpp @@ -89,12 +89,12 @@ ErrorOr serenity_main(Main::Arguments arguments) main_widget->set_fill_with_background_color(true); main_widget->set_layout(); - auto icon_view = TRY(main_widget->try_add()); - icon_view->set_should_hide_unnecessary_scrollbars(true); + auto& icon_view = main_widget->add(); + icon_view.set_should_hide_unnecessary_scrollbars(true); 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(); GUI::Process::spawn_or_show_error(window, executable); }; diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index b70ed17721..5b0a2c2a70 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -109,9 +109,9 @@ ErrorOr serenity_main(Main::Arguments arguments) } if (!matching_event_found) continue; - auto timeline_header = TRY(timeline_header_container->try_add(*profile, process)); - timeline_header->set_shrink_to_fit(true); - timeline_header->on_selection_change = [&](bool selected) { + auto& timeline_header = timeline_header_container->add(*profile, process); + timeline_header.set_shrink_to_fit(true); + timeline_header.on_selection_change = [&](bool selected) { auto end_valid = process.end_valid == EventSerialNumber {} ? EventSerialNumber::max_valid_serial() : process.end_valid; if (selected) profile->add_process_filter(process.pid, process.start_valid, end_valid); @@ -124,96 +124,96 @@ ErrorOr serenity_main(Main::Arguments arguments) }); }; - (void)TRY(timeline_view->try_add(*timeline_view, *profile, process)); + timeline_view->add(*timeline_view, *profile, process); } - auto main_splitter = TRY(main_widget->try_add()); + auto& main_splitter = main_widget->add(); - [[maybe_unused]] auto timeline_container = TRY(main_splitter->try_add(*timeline_header_container, *timeline_view)); + [[maybe_unused]] auto& timeline_container = main_splitter.add(*timeline_header_container, *timeline_view); - auto tab_widget = TRY(main_splitter->try_add()); + auto& tab_widget = main_splitter.add(); - auto& tree_tab = tab_widget->add_tab("Call Tree"_string); + auto& tree_tab = tab_widget.add_tab("Call Tree"_string); tree_tab.set_layout(4); - auto bottom_splitter = TRY(tree_tab.try_add()); + auto& bottom_splitter = tree_tab.add(); - auto tree_view = TRY(bottom_splitter->try_add()); - tree_view->set_should_fill_selected_rows(true); - tree_view->set_column_headers_visible(true); - tree_view->set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows); - tree_view->set_model(profile->model()); + auto& tree_view = bottom_splitter.add(); + tree_view.set_should_fill_selected_rows(true); + tree_view.set_column_headers_visible(true); + tree_view.set_selection_behavior(GUI::TreeView::SelectionBehavior::SelectRows); + tree_view.set_model(profile->model()); - auto disassembly_view = TRY(bottom_splitter->try_add()); - disassembly_view->set_visible(false); + auto& disassembly_view = bottom_splitter.add(); + disassembly_view.set_visible(false); auto update_disassembly_model = [&] { - if (disassembly_view->is_visible() && !tree_view->selection().is_empty()) { - profile->set_disassembly_index(tree_view->selection().first()); - disassembly_view->set_model(profile->disassembly_model()); + if (disassembly_view.is_visible() && !tree_view.selection().is_empty()) { + profile->set_disassembly_index(tree_view.selection().first()); + disassembly_view.set_model(profile->disassembly_model()); } else { - disassembly_view->set_model(nullptr); + disassembly_view.set_model(nullptr); } }; - auto source_view = TRY(bottom_splitter->try_add()); - source_view->set_visible(false); + auto& source_view = bottom_splitter.add(); + source_view.set_visible(false); auto update_source_model = [&] { - if (source_view->is_visible() && !tree_view->selection().is_empty()) { - profile->set_source_index(tree_view->selection().first()); - source_view->set_model(profile->source_model()); + if (source_view.is_visible() && !tree_view.selection().is_empty()) { + profile->set_source_index(tree_view.selection().first()); + source_view.set_model(profile->source_model()); } 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_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) { - disassembly_view->set_visible(action.is_checked()); + disassembly_view.set_visible(action.is_checked()); 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) { - source_view->set_visible(action.is_checked()); + source_view.set_visible(action.is_checked()); update_source_model(); }); - auto& samples_tab = tab_widget->add_tab("Samples"_string); + auto& samples_tab = tab_widget.add_tab("Samples"_string); samples_tab.set_layout(4); - auto samples_splitter = TRY(samples_tab.try_add()); - auto samples_table_view = TRY(samples_splitter->try_add()); - samples_table_view->set_model(profile->samples_model()); + auto& samples_splitter = samples_tab.add(); + auto& samples_table_view = samples_splitter.add(); + samples_table_view.set_model(profile->samples_model()); - auto individual_sample_view = TRY(samples_splitter->try_add()); - samples_table_view->on_selection_change = [&] { - auto const& index = samples_table_view->selection().first(); + auto& individual_sample_view = samples_splitter.add(); + samples_table_view.on_selection_change = [&] { + auto const& index = samples_table_view.selection().first(); auto model = IndividualSampleModel::create(*profile, index.data(GUI::ModelRole::Custom).to_integer()); - individual_sample_view->set_model(move(model)); + individual_sample_view.set_model(move(model)); }; - auto& signposts_tab = tab_widget->add_tab("Signposts"_string); + auto& signposts_tab = tab_widget.add_tab("Signposts"_string); signposts_tab.set_layout(4); - auto signposts_splitter = TRY(signposts_tab.try_add()); - auto signposts_table_view = TRY(signposts_splitter->try_add()); - signposts_table_view->set_model(profile->signposts_model()); + auto& signposts_splitter = signposts_tab.add(); + auto& signposts_table_view = signposts_splitter.add(); + signposts_table_view.set_model(profile->signposts_model()); - auto individual_signpost_view = TRY(signposts_splitter->try_add()); - signposts_table_view->on_selection_change = [&] { - auto const& index = signposts_table_view->selection().first(); + auto& individual_signpost_view = signposts_splitter.add(); + signposts_table_view.on_selection_change = [&] { + auto const& index = signposts_table_view.selection().first(); auto model = IndividualSampleModel::create(*profile, index.data(GUI::ModelRole::Custom).to_integer()); - individual_signpost_view->set_model(move(model)); + individual_signpost_view.set_model(move(model)); }; - auto& flamegraph_tab = tab_widget->add_tab("Flame Graph"_string); + auto& flamegraph_tab = tab_widget.add_tab("Flame Graph"_string); flamegraph_tab.set_layout(GUI::Margins { 4, 4, 4, 4 }); - auto flamegraph_view = TRY(flamegraph_tab.try_add(profile->model(), ProfileModel::Column::StackFrame, ProfileModel::Column::SampleCount)); + auto& flamegraph_view = flamegraph_tab.add(profile->model(), ProfileModel::Column::StackFrame, ProfileModel::Column::SampleCount); u64 const start_of_trace = profile->first_timestamp(); u64 const end_of_trace = start_of_trace + profile->length_in_ms(); @@ -228,12 +228,12 @@ ErrorOr serenity_main(Main::Arguments arguments) return DeprecatedString::formatted("{} Samples", sample_count.to_i32()); }; - auto statusbar = TRY(main_widget->try_add()); + auto& statusbar = main_widget->add(); auto statusbar_update = [&] { auto& view = *timeline_view; StringBuilder builder; - auto flamegraph_hovered_index = flamegraph_view->hovered_index(); + auto flamegraph_hovered_index = flamegraph_view.hovered_index(); if (flamegraph_hovered_index.is_valid()) { 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)); @@ -253,24 +253,24 @@ ErrorOr serenity_main(Main::Arguments arguments) 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(); }; - flamegraph_view->on_hover_change = [&] { statusbar_update(); }; + flamegraph_view.on_hover_change = [&] { statusbar_update(); }; - auto& filesystem_events_tab = tab_widget->add_tab("Filesystem events"_string); + auto& filesystem_events_tab = tab_widget.add_tab("Filesystem events"_string); filesystem_events_tab.set_layout(4); - auto filesystem_events_tree_view = TRY(filesystem_events_tab.try_add()); - filesystem_events_tree_view->set_should_fill_selected_rows(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_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::CloseDuration, 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::PreadDuration, false); + auto& filesystem_events_tree_view = filesystem_events_tab.add(); + filesystem_events_tree_view.set_should_fill_selected_rows(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_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::CloseDuration, 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::PreadDuration, false); auto file_menu = window->add_menu("&File"_string); file_menu->add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); @@ -291,9 +291,9 @@ ErrorOr serenity_main(Main::Arguments arguments) auto percent_action = GUI::Action::create_checkable("Show &Percentages", { Mod_Ctrl, Key_P }, [&](auto& action) { profile->set_show_percentages(action.is_checked()); - tree_view->update(); - disassembly_view->update(); - source_view->update(); + tree_view.update(); + disassembly_view.update(); + source_view.update(); }); percent_action->set_checked(false); view_menu->add_action(percent_action); diff --git a/Userland/Games/GameOfLife/main.cpp b/Userland/Games/GameOfLife/main.cpp index 801a91e9f0..1000f297e9 100644 --- a/Userland/Games/GameOfLife/main.cpp +++ b/Userland/Games/GameOfLife/main.cpp @@ -61,12 +61,12 @@ ErrorOr serenity_main(Main::Arguments arguments) auto& board_widget_container = *main_widget->find_descendant_of_type_named("board_widget_container"); board_widget_container.set_layout(GUI::Margins {}, 0); - auto board_widget = TRY(board_widget_container.try_add(board_rows, board_columns)); - board_widget->randomize_cells(); - board_widget->set_min_size(board_columns, board_rows); + auto& board_widget = board_widget_container.add(board_rows, board_columns); + board_widget.randomize_cells(); + board_widget.set_min_size(board_columns, board_rows); auto& statusbar = *main_widget->find_descendant_of_type_named("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(0).set_text(click_tip); @@ -78,8 +78,8 @@ ErrorOr serenity_main(Main::Arguments arguments) auto size_changed_function = [&] { statusbar.segment(0).set_text(click_tip); - board_widget->resize_board(rows_spinbox.value(), columns_spinbox.value()); - board_widget->update(); + board_widget.resize_board(rows_spinbox.value(), columns_spinbox.value()); + board_widget.update(); }; rows_spinbox.on_change = [&](auto) { size_changed_function(); }; @@ -88,7 +88,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto& interval_spinbox = *main_widget->find_descendant_of_type_named("interval_spinbox"); 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); @@ -97,35 +97,35 @@ ErrorOr serenity_main(Main::Arguments arguments) 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&) { - board_widget->set_running(!board_widget->is_running()); + board_widget.set_running(!board_widget.is_running()); }); 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&) { statusbar.segment(0).set_text(click_tip); - board_widget->run_generation(); + board_widget.run_generation(); }); 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&) { statusbar.segment(0).set_text(click_tip); statusbar.segment(1).set_text({}); - board_widget->clear_cells(); - board_widget->update(); + board_widget.clear_cells(); + board_widget.update(); }); 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&) { statusbar.segment(0).set_text(click_tip); statusbar.segment(1).set_text({}); - board_widget->randomize_cells(); - board_widget->update(); + board_widget.randomize_cells(); + board_widget.update(); }); 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&) { - board_widget->selected_pattern()->rotate_clockwise(); + board_widget.selected_pattern()->rotate_clockwise(); }); rotate_pattern_action->set_enabled(false); main_toolbar.add_action(rotate_pattern_action); @@ -149,12 +149,12 @@ ErrorOr serenity_main(Main::Arguments arguments) })); 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()); }; - board_widget->on_running_state_change = [&]() { - if (board_widget->is_running()) { + board_widget.on_running_state_change = [&]() { + if (board_widget.is_running()) { statusbar.segment(0).set_text("Running..."_string); play_pause_action->set_icon(paused_icon); play_pause_action->set_text("&Pause"); @@ -166,31 +166,31 @@ ErrorOr serenity_main(Main::Arguments arguments) 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()); - columns_spinbox.set_enabled(!board_widget->is_running()); - interval_spinbox.set_enabled(!board_widget->is_running()); + rows_spinbox.set_enabled(!board_widget.is_running()); + columns_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()); - clear_board_action->set_enabled(!board_widget->is_running()); - randomize_cells_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()); + 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(); 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(1).set_text({}); }; - board_widget->on_pattern_selection_state_change = [&] { - rotate_pattern_action->set_enabled(board_widget->selected_pattern() != nullptr); + board_widget.on_pattern_selection_state_change = [&] { + rotate_pattern_action->set_enabled(board_widget.selected_pattern() != nullptr); }; window->resize(600, 500); diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp index ef3cab1179..92b476c6f9 100644 --- a/Userland/Libraries/LibGUI/InputBox.cpp +++ b/Userland/Libraries/LibGUI/InputBox.cpp @@ -132,13 +132,13 @@ ErrorOr InputBox::build() main_widget->set_fill_with_background_color(true); if (!m_prompt.is_empty()) { - auto prompt_container = TRY(main_widget->try_add()); - prompt_container->set_layout(0, 8); + auto& prompt_container = main_widget->add(); + prompt_container.set_layout(0, 8); if (m_icon) { - auto image_widget = TRY(prompt_container->try_add()); - image_widget->set_bitmap(m_icon); + auto& image_widget = prompt_container.add(); + image_widget.set_bitmap(m_icon); } - m_prompt_label = TRY(prompt_container->try_add