diff --git a/Applications/Piano/KnobsWidget.cpp b/Applications/Piano/KnobsWidget.cpp index 3192e500c1..4b9e4360c2 100644 --- a/Applications/Piano/KnobsWidget.cpp +++ b/Applications/Piano/KnobsWidget.cpp @@ -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_range(octave_min - 1, octave_max - 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; if (m_change_underlying) 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_range(0, last_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; if (m_change_underlying) 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_value(max_attack - m_track_manager.current_track().attack()); 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; if (m_change_underlying) 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_value(max_decay - m_track_manager.current_track().decay()); 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; if (m_change_underlying) 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_value(max_sustain - m_track_manager.current_track().sustain()); 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; if (m_change_underlying) 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_value(max_release - m_track_manager.current_track().release()); 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; if (m_change_underlying) 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(); m_delay_knob->set_range(0, max_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; if (m_change_underlying) m_track_manager.current_track().set_delay(new_delay); diff --git a/Applications/PixelPaint/BrushTool.cpp b/Applications/PixelPaint/BrushTool.cpp index 39d2ad182e..200e270ea7 100644 --- a/Applications/PixelPaint/BrushTool.cpp +++ b/Applications/PixelPaint/BrushTool.cpp @@ -142,7 +142,7 @@ GUI::Widget* BrushTool::get_properties_widget() size_slider.set_fixed_height(20); size_slider.set_range(1, 100); size_slider.set_value(m_size); - size_slider.on_value_changed = [this](int value) { + size_slider.on_change = [this](int value) { m_size = value; }; @@ -158,7 +158,7 @@ GUI::Widget* BrushTool::get_properties_widget() hardness_slider.set_fixed_height(20); hardness_slider.set_range(1, 99); hardness_slider.set_value(m_hardness); - hardness_slider.on_value_changed = [this](int value) { + hardness_slider.on_change = [this](int value) { m_hardness = value; }; } diff --git a/Applications/PixelPaint/BucketTool.cpp b/Applications/PixelPaint/BucketTool.cpp index 7973c7938d..6cffddac20 100644 --- a/Applications/PixelPaint/BucketTool.cpp +++ b/Applications/PixelPaint/BucketTool.cpp @@ -122,7 +122,7 @@ GUI::Widget* BucketTool::get_properties_widget() threshold_slider.set_fixed_height(20); threshold_slider.set_range(0, 100); threshold_slider.set_value(m_threshold); - threshold_slider.on_value_changed = [this](int value) { + threshold_slider.on_change = [this](int value) { m_threshold = value; }; } diff --git a/Applications/PixelPaint/LayerPropertiesWidget.cpp b/Applications/PixelPaint/LayerPropertiesWidget.cpp index 6478d3e213..9c69e809e6 100644 --- a/Applications/PixelPaint/LayerPropertiesWidget.cpp +++ b/Applications/PixelPaint/LayerPropertiesWidget.cpp @@ -71,7 +71,7 @@ LayerPropertiesWidget::LayerPropertiesWidget() m_opacity_slider = opacity_container.add(); m_opacity_slider->set_fixed_height(20); 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) m_layer->set_opacity_percent(value); }; diff --git a/Applications/PixelPaint/PenTool.cpp b/Applications/PixelPaint/PenTool.cpp index a91a02918f..579231edf7 100644 --- a/Applications/PixelPaint/PenTool.cpp +++ b/Applications/PixelPaint/PenTool.cpp @@ -117,7 +117,7 @@ GUI::Widget* PenTool::get_properties_widget() thickness_slider.set_fixed_height(20); thickness_slider.set_range(1, 20); thickness_slider.set_value(m_thickness); - thickness_slider.on_value_changed = [this](int value) { + thickness_slider.on_change = [this](int value) { m_thickness = value; }; } diff --git a/Applications/PixelPaint/SprayTool.cpp b/Applications/PixelPaint/SprayTool.cpp index eaf0def9f2..9997c29674 100644 --- a/Applications/PixelPaint/SprayTool.cpp +++ b/Applications/PixelPaint/SprayTool.cpp @@ -149,7 +149,7 @@ GUI::Widget* SprayTool::get_properties_widget() thickness_slider.set_fixed_height(20); thickness_slider.set_range(1, 20); thickness_slider.set_value(m_thickness); - thickness_slider.on_value_changed = [this](int value) { + thickness_slider.on_change = [this](int value) { m_thickness = value; }; @@ -165,7 +165,7 @@ GUI::Widget* SprayTool::get_properties_widget() density_slider.set_fixed_height(30); density_slider.set_range(1, 100); density_slider.set_value(m_density); - density_slider.on_value_changed = [this](int value) { + density_slider.on_change = [this](int value) { m_density = value; }; } diff --git a/Applications/Terminal/main.cpp b/Applications/Terminal/main.cpp index 7fef9821ec..b6bc7c138f 100644 --- a/Applications/Terminal/main.cpp +++ b/Applications/Terminal/main.cpp @@ -226,7 +226,7 @@ static RefPtr create_settings_window(TerminalWidget& terminal) slider_container.set_fixed_height(50); auto& slider = slider_container.add(); - slider.on_value_changed = [&terminal](int value) { + slider.on_change = [&terminal](int value) { terminal.set_opacity(value); }; diff --git a/Demos/WidgetGallery/main.cpp b/Demos/WidgetGallery/main.cpp index 284d86bf1c..55d88d3b01 100644 --- a/Demos/WidgetGallery/main.cpp +++ b/Demos/WidgetGallery/main.cpp @@ -315,13 +315,13 @@ int main(int argc, char** argv) auto& progress1 = horizontal_slider_container2.add(); progress1.set_fixed_height(28); - slider1.on_value_changed = [&](int value) { + slider1.on_change = [&](int value) { progress1.set_value(value); if (!(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()); slider1.set_value((value * 100) / slider3.max()); }; diff --git a/Libraries/LibGUI/AbstractSlider.cpp b/Libraries/LibGUI/AbstractSlider.cpp index 551b93126b..99400b44d2 100644 --- a/Libraries/LibGUI/AbstractSlider.cpp +++ b/Libraries/LibGUI/AbstractSlider.cpp @@ -82,8 +82,8 @@ void AbstractSlider::set_value(int value) m_value = value; update(); - if (on_value_changed) - on_value_changed(m_value); + if (on_change) + on_change(m_value); } } diff --git a/Libraries/LibGUI/AbstractSlider.h b/Libraries/LibGUI/AbstractSlider.h index b61131cc21..db7d81b5fd 100644 --- a/Libraries/LibGUI/AbstractSlider.h +++ b/Libraries/LibGUI/AbstractSlider.h @@ -53,7 +53,7 @@ public: void set_step(int step) { m_step = step; } void set_page_step(int page_step); - Function on_value_changed; + Function on_change; protected: explicit AbstractSlider(Orientation = Orientation::Vertical); diff --git a/MenuApplets/Audio/main.cpp b/MenuApplets/Audio/main.cpp index 0940faedc7..1cec702530 100644 --- a/MenuApplets/Audio/main.cpp +++ b/MenuApplets/Audio/main.cpp @@ -103,7 +103,7 @@ public: m_slider->set_max(20); m_slider->set_value(0); 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); float volume_log = ((volume / 100.0f) * (volume / 100.0f)) * 100.0f; m_audio_client->set_main_mix_volume(volume_log);