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

LibGUI: Rename AbstractSlider::on_value_changed => on_change

Browse source 
This matches other similar hook names.
This commit is contained in:
Andreas Kling 2020-12-30 15:11:46 +01:00
parent 3b445bc66a
commit cb67264f61
11 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Applications/Piano/KnobsWidget.cpp
View file

@ -78,7 +78,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_octave_knob->set_tooltip("Z: octave down, X: octave up"); m_octave_knob->set_tooltip("Z: octave down, X: octave up");
m_octave_knob->set_range(octave_min - 1, octave_max - 1); m_octave_knob->set_range(octave_min - 1, octave_max - 1);
m_octave_knob->set_value((octave_max - 1) - (m_track_manager.octave() - 1)); m_octave_knob->set_value((octave_max - 1) - (m_track_manager.octave() - 1));
m_octave_knob->on_value_changed = [this](int value) { m_octave_knob->on_change = [this](int value) {
int new_octave = octave_max - value; int new_octave = octave_max - value;
if (m_change_underlying) if (m_change_underlying)
m_main_widget.set_octave_and_ensure_note_change(new_octave); m_main_widget.set_octave_and_ensure_note_change(new_octave);
@ -90,7 +90,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_wave_knob->set_tooltip("C: cycle through waveforms"); m_wave_knob->set_tooltip("C: cycle through waveforms");
m_wave_knob->set_range(0, last_wave); m_wave_knob->set_range(0, last_wave);
m_wave_knob->set_value(last_wave - m_track_manager.current_track().wave()); m_wave_knob->set_value(last_wave - m_track_manager.current_track().wave());
m_wave_knob->on_value_changed = [this](int value) { m_wave_knob->on_change = [this](int value) {
int new_wave = last_wave - value; int new_wave = last_wave - value;
if (m_change_underlying) if (m_change_underlying)
m_track_manager.current_track().set_wave(new_wave); m_track_manager.current_track().set_wave(new_wave);
@ -102,7 +102,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_attack_knob->set_range(0, max_attack); m_attack_knob->set_range(0, max_attack);
m_attack_knob->set_value(max_attack - m_track_manager.current_track().attack()); m_attack_knob->set_value(max_attack - m_track_manager.current_track().attack());
m_attack_knob->set_step(100); m_attack_knob->set_step(100);
m_attack_knob->on_value_changed = [this](int value) { m_attack_knob->on_change = [this](int value) {
int new_attack = max_attack - value; int new_attack = max_attack - value;
if (m_change_underlying) if (m_change_underlying)
m_track_manager.current_track().set_attack(new_attack); m_track_manager.current_track().set_attack(new_attack);
@ -114,7 +114,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_decay_knob->set_range(0, max_decay); m_decay_knob->set_range(0, max_decay);
m_decay_knob->set_value(max_decay - m_track_manager.current_track().decay()); m_decay_knob->set_value(max_decay - m_track_manager.current_track().decay());
m_decay_knob->set_step(100); m_decay_knob->set_step(100);
m_decay_knob->on_value_changed = [this](int value) { m_decay_knob->on_change = [this](int value) {
int new_decay = max_decay - value; int new_decay = max_decay - value;
if (m_change_underlying) if (m_change_underlying)
m_track_manager.current_track().set_decay(new_decay); m_track_manager.current_track().set_decay(new_decay);
@ -126,7 +126,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_sustain_knob->set_range(0, max_sustain); m_sustain_knob->set_range(0, max_sustain);
m_sustain_knob->set_value(max_sustain - m_track_manager.current_track().sustain()); m_sustain_knob->set_value(max_sustain - m_track_manager.current_track().sustain());
m_sustain_knob->set_step(100); m_sustain_knob->set_step(100);
m_sustain_knob->on_value_changed = [this](int value) { m_sustain_knob->on_change = [this](int value) {
int new_sustain = max_sustain - value; int new_sustain = max_sustain - value;
if (m_change_underlying) if (m_change_underlying)
m_track_manager.current_track().set_sustain(new_sustain); m_track_manager.current_track().set_sustain(new_sustain);
@ -138,7 +138,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_release_knob->set_range(0, max_release); m_release_knob->set_range(0, max_release);
m_release_knob->set_value(max_release - m_track_manager.current_track().release()); m_release_knob->set_value(max_release - m_track_manager.current_track().release());
m_release_knob->set_step(100); m_release_knob->set_step(100);
m_release_knob->on_value_changed = [this](int value) { m_release_knob->on_change = [this](int value) {
int new_release = max_release - value; int new_release = max_release - value;
if (m_change_underlying) if (m_change_underlying)
m_track_manager.current_track().set_release(new_release); m_track_manager.current_track().set_release(new_release);
@ -149,7 +149,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_delay_knob = m_knobs_container->add<GUI::VerticalSlider>(); m_delay_knob = m_knobs_container->add<GUI::VerticalSlider>();
m_delay_knob->set_range(0, max_delay); m_delay_knob->set_range(0, max_delay);
m_delay_knob->set_value(max_delay - m_track_manager.current_track().delay()); m_delay_knob->set_value(max_delay - m_track_manager.current_track().delay());
m_delay_knob->on_value_changed = [this](int value) { m_delay_knob->on_change = [this](int value) {
int new_delay = max_delay - value; int new_delay = max_delay - value;
if (m_change_underlying) if (m_change_underlying)
m_track_manager.current_track().set_delay(new_delay); m_track_manager.current_track().set_delay(new_delay);

4
Applications/PixelPaint/BrushTool.cpp
View file

@ -142,7 +142,7 @@ GUI::Widget* BrushTool::get_properties_widget()
size_slider.set_fixed_height(20); size_slider.set_fixed_height(20);
size_slider.set_range(1, 100); size_slider.set_range(1, 100);
size_slider.set_value(m_size); size_slider.set_value(m_size);
size_slider.on_value_changed = [this](int value) { size_slider.on_change = [this](int value) {
m_size = value; m_size = value;
}; };
@ -158,7 +158,7 @@ GUI::Widget* BrushTool::get_properties_widget()
hardness_slider.set_fixed_height(20); hardness_slider.set_fixed_height(20);
hardness_slider.set_range(1, 99); hardness_slider.set_range(1, 99);
hardness_slider.set_value(m_hardness); hardness_slider.set_value(m_hardness);
hardness_slider.on_value_changed = [this](int value) { hardness_slider.on_change = [this](int value) {
m_hardness = value; m_hardness = value;
}; };
} }

2
Applications/PixelPaint/BucketTool.cpp
View file

@ -122,7 +122,7 @@ GUI::Widget* BucketTool::get_properties_widget()
threshold_slider.set_fixed_height(20); threshold_slider.set_fixed_height(20);
threshold_slider.set_range(0, 100); threshold_slider.set_range(0, 100);
threshold_slider.set_value(m_threshold); threshold_slider.set_value(m_threshold);
threshold_slider.on_value_changed = [this](int value) { threshold_slider.on_change = [this](int value) {
m_threshold = value; m_threshold = value;
}; };
} }

2
Applications/PixelPaint/LayerPropertiesWidget.cpp
View file

@ -71,7 +71,7 @@ LayerPropertiesWidget::LayerPropertiesWidget()
m_opacity_slider = opacity_container.add<GUI::HorizontalSlider>(); m_opacity_slider = opacity_container.add<GUI::HorizontalSlider>();
m_opacity_slider->set_fixed_height(20); m_opacity_slider->set_fixed_height(20);
m_opacity_slider->set_range(0, 100); m_opacity_slider->set_range(0, 100);
m_opacity_slider->on_value_changed = [this](int value) { m_opacity_slider->on_change = [this](int value) {
if (m_layer) if (m_layer)
m_layer->set_opacity_percent(value); m_layer->set_opacity_percent(value);
}; };

2
Applications/PixelPaint/PenTool.cpp
View file

@ -117,7 +117,7 @@ GUI::Widget* PenTool::get_properties_widget()
thickness_slider.set_fixed_height(20); thickness_slider.set_fixed_height(20);
thickness_slider.set_range(1, 20); thickness_slider.set_range(1, 20);
thickness_slider.set_value(m_thickness); thickness_slider.set_value(m_thickness);
thickness_slider.on_value_changed = [this](int value) { thickness_slider.on_change = [this](int value) {
m_thickness = value; m_thickness = value;
}; };
} }

4
Applications/PixelPaint/SprayTool.cpp
View file

@ -149,7 +149,7 @@ GUI::Widget* SprayTool::get_properties_widget()
thickness_slider.set_fixed_height(20); thickness_slider.set_fixed_height(20);
thickness_slider.set_range(1, 20); thickness_slider.set_range(1, 20);
thickness_slider.set_value(m_thickness); thickness_slider.set_value(m_thickness);
thickness_slider.on_value_changed = [this](int value) { thickness_slider.on_change = [this](int value) {
m_thickness = value; m_thickness = value;
}; };
@ -165,7 +165,7 @@ GUI::Widget* SprayTool::get_properties_widget()
density_slider.set_fixed_height(30); density_slider.set_fixed_height(30);
density_slider.set_range(1, 100); density_slider.set_range(1, 100);
density_slider.set_value(m_density); density_slider.set_value(m_density);
density_slider.on_value_changed = [this](int value) { density_slider.on_change = [this](int value) {
m_density = value; m_density = value;
}; };
} }

2
Applications/Terminal/main.cpp
View file

@ -226,7 +226,7 @@ static RefPtr<GUI::Window> create_settings_window(TerminalWidget& terminal)
slider_container.set_fixed_height(50); slider_container.set_fixed_height(50);
auto& slider = slider_container.add<GUI::HorizontalSlider>(); auto& slider = slider_container.add<GUI::HorizontalSlider>();
slider.on_value_changed = [&terminal](int value) { slider.on_change = [&terminal](int value) {
terminal.set_opacity(value); terminal.set_opacity(value);
}; };

4
Demos/WidgetGallery/main.cpp
View file

@ -315,13 +315,13 @@ int main(int argc, char** argv)
auto& progress1 = horizontal_slider_container2.add<GUI::ProgressBar>(); auto& progress1 = horizontal_slider_container2.add<GUI::ProgressBar>();
progress1.set_fixed_height(28); progress1.set_fixed_height(28);
slider1.on_value_changed = [&](int value) { slider1.on_change = [&](int value) {
progress1.set_value(value); progress1.set_value(value);
if (!(value % (100 / slider3.max()))) if (!(value % (100 / slider3.max())))
slider3.set_value(value / (100 / slider3.max())); slider3.set_value(value / (100 / slider3.max()));
}; };
slider3.on_value_changed = [&](int value) { slider3.on_change = [&](int value) {
progress1.set_value((value * 100) / slider3.max()); progress1.set_value((value * 100) / slider3.max());
slider1.set_value((value * 100) / slider3.max()); slider1.set_value((value * 100) / slider3.max());
}; };

4
Libraries/LibGUI/AbstractSlider.cpp
View file

@ -82,8 +82,8 @@ void AbstractSlider::set_value(int value)
m_value = value; m_value = value;
update(); update();
if (on_value_changed) if (on_change)
on_value_changed(m_value); on_change(m_value);
} }
} }

2
Libraries/LibGUI/AbstractSlider.h
View file

@ -53,7 +53,7 @@ public:
void set_step(int step) { m_step = step; } void set_step(int step) { m_step = step; }
void set_page_step(int page_step); void set_page_step(int page_step);
Function<void(int)> on_value_changed; Function<void(int)> on_change;
protected: protected:
explicit AbstractSlider(Orientation = Orientation::Vertical); explicit AbstractSlider(Orientation = Orientation::Vertical);

2
MenuApplets/Audio/main.cpp
View file

@ -103,7 +103,7 @@ public:
m_slider->set_max(20); m_slider->set_max(20);
m_slider->set_value(0); m_slider->set_value(0);
m_slider->set_knob_size_mode(GUI::Slider::KnobSizeMode::Proportional); m_slider->set_knob_size_mode(GUI::Slider::KnobSizeMode::Proportional);
m_slider->on_value_changed = [&](int value) { m_slider->on_change = [&](int value) {
int volume = clamp((20 - value) * 5, 0, 100); int volume = clamp((20 - value) * 5, 0, 100);
float volume_log = ((volume / 100.0f) * (volume / 100.0f)) * 100.0f; float volume_log = ((volume / 100.0f) * (volume / 100.0f)) * 100.0f;
m_audio_client->set_main_mix_volume(volume_log); m_audio_client->set_main_mix_volume(volume_log);