RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 16:37:47 +00:00
Code Issues Activity Actions

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

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

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

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

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

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

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

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