wip

Author: yjpark

apps/notation_viewer/assets/kb/usage.md

@@ -1,10 +1,10 @@
 # Keyboard Shortcuts - GUI
-- *Tab* toggle control gui (right)
 - *F1, H* toggle help dialog
 - *F2* toggle guitar view (left)
 - *F3* toggle chords view (top)
 - *F4* toggle mini map (bottom)
 - *F5, R* reload current tab
+- *F10, Backslash* toggle control gui (right)
 
 # Keyboard Shortcuts - Move Around
 - *Home* jump to the first bar of current section
@@ -32,7 +32,7 @@
 - *E* set repeat selection to current section
 
 # Keyboard Shortcuts - Others
-- *Backspace* toggle layout between grid mode and line mode
+- *Minus* toggle layout between grid mode and line mode
 - *G* toggle whether showing syllable in guitar fretboard
 - *M* toggle whether showing syllable in melody lines
 - *F* toggle whether always show fret number in guitar tab

apps/notation_viewer/src/viewer.rs

@@ -6,7 +6,6 @@ use notation_bevy::bevy::input::mouse::{MouseMotion, MouseWheel, MouseScrollUnit
 
 use notation_bevy::prelude::*;
 use notation_bevy::settings::layout_settings::LayoutMode;
-use notation_bevy::notation_midi::prelude::*;
 
 use crate::assets::NotationViewerAssets;
 use crate::help_panel::HelpPanel;
@@ -67,7 +66,7 @@ impl NotationViewer {
         if keyboard_input.just_released(KeyCode::F10) || keyboard_input.just_released(KeyCode::Backslash) {
             app_state.show_control = !app_state.show_control;
             if !ControlPanel::HUD_MODE {
-                window_resized_evts.send(WindowResizedEvent());
+                window_resized_evts.send(WindowResizedEvent::new(&app_state));
             }
         } else if keyboard_input.just_released(KeyCode::F1) || keyboard_input.just_released(KeyCode::H)
         {

crates/notation_bevy/src/kb/notes_page.rs

@@ -96,9 +96,9 @@ impl NotesPage {
                     PageHelper::add_syllable_pitch_with_transpose(
                         ui,
                         theme,
-                        transpose,
                         &scale,
                         &key,
+                        transpose,
                         syllable,
                         index == 0,
                     );

crates/notation_bevy/src/kb/page_helper.rs

@@ -68,17 +68,15 @@ impl PageHelper {
     }
     pub fn add_syllable_pitch_with_transpose(
         ui: &mut Ui,
-        _theme: &NotationTheme,
-        transpose: i8,
+        theme: &NotationTheme,
         scale: &Scale,
         key: &Key,
+        transpose: i8,
         syllable: &Syllable,
         strong: bool,
     ) {
-        let pitch = scale.calc_pitch(&key, &syllable);
-        let pitch = Pitch::from(Semitones::from(pitch) - Semitones(transpose));
-        let text = pitch.to_string();
-        Self::add_maybe_strong_text(ui, strong, &text);
+        let key = Key::from(Semitones::from(*key) - Semitones(transpose));
+        Self::add_syllable_pitch(ui, theme, scale, &key, syllable, strong);
     }
     pub fn add_interval_syllable(
         ui: &mut Ui,

crates/notation_core/src/key.rs

@@ -130,6 +130,12 @@ impl From<Key> for Semitones {
     }
 }
 
+impl From<Semitones> for Key {
+    fn from(v: Semitones) -> Self {
+        Syllable::from(v).into()
+    }
+}
+
 impl From<Syllable> for Key {
     fn from(v: Syllable) -> Self {
         match v {