jan-henrik/eurorack
1
0
Fork 0
mirror of https://github.com/jhbruhn/eurorack.git synced 2025-03-15 02:55:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix scrolling for invisible items

Browse source
This commit is contained in:
Jan-Henrik 2020-02-26 19:29:42 +01:00
parent 677898f9f9
commit 602faa5c8f
2 changed files with 53 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
midi2cv/menu/menu.cc
View file

@ -59,13 +59,29 @@ void Menu::update_visible_items()
void Menu::up() void Menu::up()
{ {
this->update_visible_items();
if (this->currentEditingVisibleItem >= 0) { if (this->currentEditingVisibleItem >= 0) {
// we store the amount of visible items before the counter before this->update_visible_items();
// changing and then compare afterwards to move the cursor back to
// its intended position if necessary
this->visibleItems[this->selectedVisibleItem]->decrease();
AbstractMenuItem* item = this->visibleItems[this->selectedVisibleItem];
item->decrease();
this->update_visible_items();
if (this->visibleItems[this->selectedVisibleItem] != item) {
int8_t delta = 0;
// the index of our visible item has changed.
// go through the list of visible items and find it!
for (size_t i = 0; i < this->visibleItemCount; i++) {
if (this->visibleItems[i] == item) {
delta = this->selectedVisibleItem - i;
this->selectedVisibleItem = this->currentEditingVisibleItem = i;
break;
}
}
this->currentVisibleScrollStart -= delta;
CONSTRAIN(this->currentEditingVisibleItem, 0, this->visibleItemCount);
}
} else if (this->selectedVisibleItem > 0) { } else if (this->selectedVisibleItem > 0) {
uint8_t newItem = this->selectedVisibleItem - 1; uint8_t newItem = this->selectedVisibleItem - 1;
@ -79,14 +95,35 @@ void Menu::up()
this->currentVisibleScrollStart = 0; this->currentVisibleScrollStart = 0;
} }
} }
this->update_visible_items();
} }
void Menu::down() void Menu::down()
{ {
this->update_visible_items(); this->update_visible_items();
if (this->currentEditingVisibleItem >= 0) { if (this->currentEditingVisibleItem >= 0) {
this->visibleItems[this->selectedVisibleItem]->increase(); this->update_visible_items();
AbstractMenuItem* item = this->visibleItems[this->selectedVisibleItem];
item->increase();
this->update_visible_items();
if (this->visibleItems[this->selectedVisibleItem] != item) {
int8_t delta = 0;
// the index of our visible item has changed.
// go through the list of visible items and find it!
for (size_t i = 0; i < this->visibleItemCount; i++) {
if (this->visibleItems[i] == item) {
delta = this->selectedVisibleItem - i;
this->selectedVisibleItem = this->currentEditingVisibleItem = i;
break;
}
}
this->currentVisibleScrollStart -= delta;
CONSTRAIN(this->currentEditingVisibleItem, 0, this->visibleItemCount);
}
} else { } else {
uint8_t maxVisibleItems = height / kMenuItemHeight; uint8_t maxVisibleItems = height / kMenuItemHeight;
if (this->selectedVisibleItem < this->visibleItemCount - 1) { if (this->selectedVisibleItem < this->visibleItemCount - 1) {

12
midi2cv/ui/part_menu.cc
View file

@ -18,9 +18,15 @@ PartMenu::PartMenu(Part* _part)
, item_midi_channel("MIDI channel", (uint8_t*)&_part->data.midi_filter_channel, kMidiChannelStrings, 17, [_part] { , item_midi_channel("MIDI channel", (uint8_t*)&_part->data.midi_filter_channel, kMidiChannelStrings, 17, [_part] {
return _part->data.midi_filter_channel_enabled; return _part->data.midi_filter_channel_enabled;
}) })
, item_midi_input("MIDI input", (uint8_t*)&_part->data.midi_filter_input, kMidiInputStrings, 3) , item_midi_input("MIDI input", (uint8_t*)&_part->data.midi_filter_input, kMidiInputStrings, 3, [_part] {
, item_midi_lowest_note("MIDI lowest", (uint8_t*)&_part->data.midi_filter_lowest_note) return _part->data.midi_filter_channel_enabled;
, item_midi_highest_note("MIDI highest", (uint8_t*)&_part->data.midi_filter_highest_note) })
, item_midi_lowest_note("MIDI lowest", (uint8_t*)&_part->data.midi_filter_lowest_note, [_part] {
return _part->data.midi_filter_channel_enabled;
})
, item_midi_highest_note("MIDI highest", (uint8_t*)&_part->data.midi_filter_highest_note, [_part] {
return _part->data.midi_filter_channel_enabled;
})
, item_midi_thru_mode("MIDI thru", (uint8_t*)&_part->data.midi_thru_mode, kMidiThruStrings, 3) , item_midi_thru_mode("MIDI thru", (uint8_t*)&_part->data.midi_thru_mode, kMidiThruStrings, 3)
{ {
this->menu.add_item(&this->item_voice_count); this->menu.add_item(&this->item_voice_count);