use up and down key to move a whole row

Author: yjpark

apps/notation_viewer/assets/kb/en-US/usage.md

@@ -13,7 +13,9 @@
 - *Page Down* jump to the first bar of next section
 - *Left* jump to last bar
 - *Right* jump to next bar
-- *Down* play one guitar note (same as clicking on guitar fretboard)
+- *Up* jump to last row
+- *Down* jump to next row
+- *\`* play one guitar note (same as clicking on guitar fretboard)
 
 # Keyboard Shortcuts - Play Control
 - *Space* play or pause

apps/notation_viewer/assets/kb/zh-CN/usage.md

@@ -13,7 +13,9 @@
 - *Page Down* 跳转到下一段落的第一个小节
 - *Left* 跳转到上一小节
 - *Right* 跳转到下一小节
-- *Down* 触发一个吉他音符 (也可以鼠标单击吉他指板)
+- *Up* 跳转到上一行
+- *Down* 跳转到下一行
+- *\`* 触发一个吉他音符 (也可以鼠标单击吉他指板)
 
 # 快捷键 - 播放控制
 - *Space* 开始或暂停

apps/notation_viewer/src/viewer.rs

@@ -57,6 +57,7 @@ impl NotationViewer {
         mut play_control_evts: EventWriter<PlayControlEvent>,
         mut window_resized_evts: EventWriter<WindowResizedEvent>,
         mut jump_to_bar_evts: EventWriter<JumpToBarEvent>,
+        tab_bars_query: Query<(&TabBars, &GridData), With<TabBars>>,
     ) {
         if egui_ctx.ctx().wants_keyboard_input() {
             return;
@@ -98,7 +99,11 @@ impl NotationViewer {
             MidiControl::jump_to_prev_bar(&midi_state, &mut jump_to_bar_evts);
         } else if keyboard_input.just_released(KeyCode::Right) {
             MidiControl::jump_to_next_bar(&midi_state, &mut jump_to_bar_evts);
+        } else if keyboard_input.just_released(KeyCode::Up) {
+            MidiControl::jump_to_prev_row(&midi_state, &mut jump_to_bar_evts, &tab_bars_query);
         } else if keyboard_input.just_released(KeyCode::Down) {
+            MidiControl::jump_to_next_row(&midi_state, &mut jump_to_bar_evts, &tab_bars_query);
+        } else if keyboard_input.just_released(KeyCode::Grave) {
             MidiControl::seek_forward(&midi_settings, &mut midi_state, &mut play_control_evts);
         } else if keyboard_input.just_released(KeyCode::Minus) {
             Control::toggle_layout_mode(&mut app_state, &mut settings, &mut theme);

crates/notation_bevy/src/midi/midi_control.rs

@@ -1,11 +1,13 @@
 use std::sync::Arc;
 
 use bevy::prelude::*;
+use notation_bevy_utils::prelude::GridData;
 use notation_midi::prelude::{MidiSettings, MidiState};
 use notation_model::play::play_control::TickResult;
 use notation_model::prelude::{JumpToBarEvent, PlayControlEvent, BarPosition, Tab, Units};
 use notation_model::tab_bar::TabBar;
 
+use crate::tab::tab_bars::TabBars;
 use crate::tab::tab_plugin::{TabPlugin};
 
 use crate::prelude::{NotationSettings};
@@ -221,6 +223,42 @@ impl MidiControl {
             None
         });
     }
+    pub fn get_grid_cols(
+        tab_bars_query: &Query<(&TabBars, &GridData), With<TabBars>>,
+    ) -> usize {
+        for (_tab_bars, grid_data) in tab_bars_query.iter() {
+            return grid_data.cols;
+        }
+        2
+    }
+    pub fn jump_to_prev_row(
+        midi_state: &MidiState,
+        jump_to_bar_evts: &mut EventWriter<JumpToBarEvent>,
+        tab_bars_query: &Query<(&TabBars, &GridData), With<TabBars>>,
+    ) {
+        Self::jump_to_bar(midi_state, jump_to_bar_evts, &|tab, pos| {
+            let cols = Self::get_grid_cols(tab_bars_query);
+            if pos.bar_ordinal > cols {
+                tab.get_bar_of_ordinal(pos.bar_ordinal - cols)
+            } else {
+                tab.get_bar_of_ordinal(0)
+            }
+        });
+    }
+    pub fn jump_to_next_row(
+        midi_state: &MidiState,
+        jump_to_bar_evts: &mut EventWriter<JumpToBarEvent>,
+        tab_bars_query: &Query<(&TabBars, &GridData), With<TabBars>>,
+    ) {
+        Self::jump_to_bar(midi_state, jump_to_bar_evts, &|tab, pos| {
+            let cols = Self::get_grid_cols(tab_bars_query);
+            if pos.bar_ordinal < tab.bars.len() - cols {
+                tab.get_bar_of_ordinal(pos.bar_ordinal + cols)
+            } else {
+                tab.get_bar_of_ordinal(tab.bars.len() - 1)
+            }
+        });
+    }
     pub fn send_begin_end_evt(
         midi_state: &mut MidiState,
         play_control_evts: &mut EventWriter<PlayControlEvent>,