beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Piano: Handle octave slider jumps of greater than 1

Browse source 
The previous slider handler relied on the new value being 1 different
than the previous.

fixes #1163.
This commit is contained in:
Peter Elliott 2020-07-06 14:52:29 -06:00 committed by Andreas Kling
parent 0fd31ef598
commit b8cf07166f
Notes: sideshowbarker 2024-07-19 04:56:52 +09:00 
Author: https://github.com/petelliott
Commit: https://github.com/SerenityOS/serenity/commit/b8cf07166f8
Pull-request: https://github.com/SerenityOS/serenity/pull/2716
5 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Applications/Piano/KnobsWidget.cpp
View file

@ -83,7 +83,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
m_octave_knob->on_value_changed = [this](int value) {
int new_octave = octave_max - value;
if (m_change_underlying)
m_main_widget.set_octave_and_ensure_note_change(new_octave == m_track_manager.octave() + 1 ? Up : Down);
m_main_widget.set_octave_and_ensure_note_change(new_octave);
ASSERT(new_octave == m_track_manager.octave());
m_octave_value->set_text(String::number(new_octave));
};

10
Applications/Piano/MainWidget.cpp
View file

@ -160,6 +160,16 @@ void MainWidget::turn_on_pressed_keys()
}
}
void MainWidget::set_octave_and_ensure_note_change(int octave)
{
turn_off_pressed_keys();
m_track_manager.set_octave(octave);
turn_on_pressed_keys();
m_knobs_widget->update_knobs();
m_keys_widget->update();
}
void MainWidget::set_octave_and_ensure_note_change(Direction direction)
{
turn_off_pressed_keys();

1
Applications/Piano/MainWidget.h
View file

@ -45,6 +45,7 @@ public:
void add_actions(GUI::Menu&);
void set_octave_and_ensure_note_change(Direction);
void set_octave_and_ensure_note_change(int);
private:
explicit MainWidget(TrackManager&);

7
Applications/Piano/TrackManager.cpp
View file

@ -85,6 +85,13 @@ void TrackManager::set_octave(Direction direction)
}
}
void TrackManager::set_octave(int octave)
{
if (octave <= octave_max && octave >= octave_min) {
m_octave = octave;
}
}
void TrackManager::add_track()
{
m_tracks.append(make<Track>(m_time));

1
Applications/Piano/TrackManager.h
View file

@ -51,6 +51,7 @@ public:
void set_should_loop(bool b) { m_should_loop = b; }
void set_note_current_octave(int note, Switch);
void set_octave(Direction);
void set_octave(int octave);
void add_track();
void next_track();