fixes #146, check egui for input handling, refs #145, add empty kb page for guitar

Author: yjpark

apps/notation_kb/assets/kb/guitar.md

@@ -0,0 +1 @@
+TODO

apps/notation_kb/src/assets.rs

@@ -11,6 +11,9 @@ pub struct NotationKnowledgeBaseAssets {
 
     #[asset(path = "kb/scale.md")]
     pub kb_scale: Handle<MarkDownAsset>,
+
+    #[asset(path = "kb/guitar.md")]
+    pub kb_guitar: Handle<MarkDownAsset>,
 }
 
 impl ExtraAssets for NotationKnowledgeBaseAssets {
@@ -19,6 +22,7 @@ impl ExtraAssets for NotationKnowledgeBaseAssets {
             self.kb_welcome.clone_untyped(),
             self.kb_sound.clone_untyped(),
             self.kb_scale.clone_untyped(),
+            self.kb_guitar.clone_untyped(),
         ]
     }
     fn get_latin_font() -> &'static str {

apps/notation_kb/src/guitar/mod.rs

@@ -1 +1 @@
-pub mod fretboard;
+pub mod page;

apps/notation_kb/src/guitar/fretboard.rs apps/notation_kb/src/guitar/page.rsapps/notation_kb/src/guitar/fretboard.rs renamed to apps/notation_kb/src/guitar/page.rs

@@ -8,11 +8,11 @@ use notation_bevy::kb::markdown_page::MarkDownPage;
 use notation_bevy::prelude::{NotationState, NotationAssets, NotationTheme, MarkDownAsset, KbPage, KbContent, EasyLinkEvent, BevyUtil, Syllable};
 
 #[derive(Copy, Clone, Debug)]
-pub struct FretboardPage {
+pub struct GuitarPage {
     pub path: &'static str,
 }
 
-impl KbPage for FretboardPage {
+impl KbPage for GuitarPage {
     fn page_ui(
         &mut self,
         ui: &mut Ui,
@@ -26,7 +26,7 @@ impl KbPage for FretboardPage {
     }
 }
 
-impl KbContent for FretboardPage {
+impl KbContent for GuitarPage {
     fn content_ui(
         &mut self,
         ui: &mut Ui,
@@ -40,7 +40,7 @@ impl KbContent for FretboardPage {
     }
 }
 
-impl FretboardPage {
+impl GuitarPage {
     pub fn new(path: &'static str) -> Self {
         Self {
             path,

apps/notation_kb/src/index_panel.rs

@@ -6,7 +6,9 @@ use notation_bevy::prelude::{MarkDownAsset, KbPageId, KbPage, KbContent, KbPanel
 use notation_bevy::prelude::{NotationState, NotationAssets, NotationTheme};
 
 use notation_bevy::kb::markdown_page::MarkDownPage;
+use notation_bevy::tab::tab_control::TabControl;
 
+use crate::guitar::page::GuitarPage;
 use crate::theory::scale::ScalePage;
 use crate::theory::sound::{SoundPage, SoundSection};
 
@@ -17,6 +19,7 @@ pub struct IndexPanel {
     pub welcome: MarkDownPage,
     pub sound: SoundPage,
     pub scale: ScalePage,
+    pub guitar: GuitarPage,
 }
 
 impl Default for IndexPanel {
@@ -29,6 +32,7 @@ Caused by:
     In CommandEncoder::copy_buffer_to_texture
     Copy error
     copy of Y 0..256 would end up overruning the bounds of the Destination texture of Y size 128
+            TODO: Check whether still needed after upgrade bevy and bevy_egui
              */
             skip_frames: 2,
 
@@ -40,6 +44,7 @@ Caused by:
             welcome: MarkDownPage::new(Self::PATH_WELCOME),
             sound: SoundPage::new(Self::PATH_SOUND),
             scale: ScalePage::new(Self::PATH_SCALE),
+            guitar: GuitarPage::new(Self::PATH_GUITAR),
         }
     }
 }
@@ -48,13 +53,16 @@ impl IndexPanel {
     pub const WELCOME: KbPageId = KbPageId::MarkDown(Self::PATH_WELCOME);
     pub const SOUND: KbPageId = KbPageId::Custom("sound");
     pub const SCALE: KbPageId = KbPageId::Custom("scale");
+    pub const GUITAR: KbPageId = KbPageId::Custom("guitar");
 
     pub const PATH_WELCOME: &'static str = "kb/welcome.md";
     pub const PATH_SOUND: &'static str = "kb/sound.md";
     pub const PATH_SCALE: &'static str = "kb/scale.md";
+    pub const PATH_GUITAR: &'static str = "kb/guitar.md";
 
     pub const LINK_SOUND: &'static str = ":kb:sound";
     pub const LINK_SCALE: &'static str = ":kb:scale";
+    pub const LINK_GUITAR: &'static str = ":kb:guitar";
     pub const LINK_SOUND_SINGLE_STRING: &'static str = ":kb:sound:single_string";
 
     pub const LINK_MIDI_PLAY: &'static str = ":midi:play";
@@ -76,12 +84,14 @@ impl KbPanel for IndexPanel {
             (Self::WELCOME, "Welcome"),
             (Self::SOUND, "Sound"),
             (Self::SCALE, "Scale"),
+            (Self::GUITAR, "Guitar"),
         ]
     }
     fn get_page_mut(&mut self, page_id: KbPageId) -> &mut dyn KbPage {
         match page_id {
             Self::SOUND => &mut self.sound as &mut dyn KbPage,
             Self::SCALE => &mut self.scale as &mut dyn KbPage,
+            Self::GUITAR => &mut self.guitar as &mut dyn KbPage,
             _ => &mut self.welcome as &mut dyn KbPage,
         }
     }
@@ -109,6 +119,7 @@ impl IndexPanel {
         state: Res<NotationState>,
         mut theme: ResMut<NotationTheme>,
         mut settings: ResMut<NotationSettings>,
+        index: Res<IndexPanel>,
     ) {
         theme.sizes.melody.note_height = 8.0;
         theme.sizes.melody.semitone_height = 8.0;
@@ -122,8 +133,9 @@ impl IndexPanel {
             if state.window_width > state.window_height {
                 let width = state.window_width / 3.0 + theme.sizes.layout.page_margin;
                 settings.hide_guitar_view = false;
-                settings.override_guitar_width = Some(width);
                 settings.hide_chords_view = true;
+                settings.override_guitar_width = Some(width);
+                settings.layout.override_tab_width = None;
             } else {
                 settings.hide_guitar_view = true;
                 settings.hide_chords_view = false;

apps/notation_kb_cn/src/main.rs

@@ -16,6 +16,9 @@ pub struct NotationKnowledgeBaseAssets {
 
     #[asset(path = "kb/scale.md")]
     pub kb_scale: Handle<MarkDownAsset>,
+
+    #[asset(path = "kb/guitar.md")]
+    pub kb_guitar: Handle<MarkDownAsset>,
 }
 
 impl ExtraAssets for NotationKnowledgeBaseAssets {
@@ -24,6 +27,7 @@ impl ExtraAssets for NotationKnowledgeBaseAssets {
             self.kb_welcome.clone_untyped(),
             self.kb_sound.clone_untyped(),
             self.kb_scale.clone_untyped(),
+            self.kb_guitar.clone_untyped(),
         ]
     }
     fn get_lyrics_font() -> &'static str {

apps/notation_viewer/src/viewer.rs

@@ -1,6 +1,7 @@
 use notation_bevy::bevy::prelude::*;
 use notation_bevy::bevy::input::mouse::{MouseMotion, MouseWheel, MouseScrollUnit};
 
+use notation_bevy::bevy_egui::EguiContext;
 use notation_bevy::prelude::*;
 use notation_bevy::settings::layout_settings::LayoutMode;
 
@@ -48,6 +49,7 @@ impl NotationViewer {
 
     fn handle_keyboard_inputs(
         keyboard_input: Res<Input<KeyCode>>,
+        egui_ctx: Res<EguiContext>,
         mut app_state: ResMut<NotationState>,
         mut settings: ResMut<NotationSettings>,
         mut theme: ResMut<NotationTheme>,
@@ -60,6 +62,9 @@ impl NotationViewer {
         if app_state.tab.is_none() {
             return;
         }
+        if egui_ctx.ctx().wants_keyboard_input() {
+            return;
+        }
         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 {
@@ -121,8 +126,7 @@ impl NotationViewer {
             MidiControl::set_begin_bar_ordinal(&mut midi_state, &mut play_control_evts);
             MidiControl::set_end_bar_ordinal(&mut midi_state, &mut play_control_evts);
         } else if keyboard_input.just_released(KeyCode::E) {
-            MidiControl::set_begin_bar_ordinal(&mut midi_state, &mut play_control_evts);
-            MidiControl::set_end_bar_ordinal(&mut midi_state, &mut play_control_evts);
+            MidiControl::set_begin_end_to_section(&mut midi_state, &mut play_control_evts);
         } else if keyboard_input.just_released(KeyCode::Key1) {
             MidiControl::set_speed_factor(&mut settings, &mut midi_state, &mut play_control_evts, 0.25);
         } else if keyboard_input.just_released(KeyCode::Key2) {
@@ -137,6 +141,7 @@ impl NotationViewer {
     fn handle_mouse_inputs(
         windows: Res<Windows>,
         mouse_input: Res<Input<MouseButton>>,
+        egui_ctx: Res<EguiContext>,
         app_state: Res<NotationState>,
         settings: Res<NotationSettings>,
         mut mouse_motion_events: EventReader<MouseMotion>,
@@ -147,6 +152,9 @@ impl NotationViewer {
         if app_state.tab.is_none() {
             return;
         }
+        if egui_ctx.ctx().is_pointer_over_area() {
+            return;
+        }
         let cursor_position = windows.get_primary().and_then(|x| x.cursor_position());
         if cursor_position.is_none() {
             return;
@@ -187,13 +195,17 @@ impl NotationViewer {
     fn handle_touch_inputs(
         windows: Res<Windows>,
         touch_input: Res<Touches>,
+        egui_ctx: Res<EguiContext>,
         mut app_state: ResMut<NotationState>,
         mut mouse_clicked: EventWriter<MouseClickedEvent>,
         //mut mouse_dragged: EventWriter<MouseDraggedEvent>,
     ) {
         if app_state.tab.is_none() {
             return;
         }
+        if egui_ctx.ctx().wants_pointer_input() {
+            return;
+        }
         for (_index, finger) in touch_input.iter().enumerate() {
             if touch_input.just_pressed(finger.id()) {
                 windows

crates/notation_bevy/src/tab/tab_control.rs

@@ -30,6 +30,16 @@ impl TabControl {
     pub fn new(tab: Arc<Tab>) -> Self {
         Self { tab }
     }
+    pub fn calc_width(max_width: f32, theme: &NotationTheme) -> f32 {
+        let mut width =
+            max_width * theme.sizes.tab_control.control_width_factor;
+        if width < theme.sizes.tab_control.tab_control_range.0 {
+            width = theme.sizes.tab_control.tab_control_range.0;
+        } else if width > theme.sizes.tab_control.tab_control_range.1 {
+            width = theme.sizes.tab_control.tab_control_range.1;
+        }
+        width
+    }
 }
 impl<'a> View<NotationLayout<'a>> for TabControl {
     fn calc_size(&self, engine: &NotationLayout, constraint: LayoutConstraint) -> LayoutSize {
@@ -39,14 +49,7 @@ impl<'a> View<NotationLayout<'a>> for TabControl {
         let width = match engine.settings.override_guitar_width {
             Some(width) => width,
             None => {
-                let mut width =
-                    constraint.max.width * engine.theme.sizes.tab_control.control_width_factor;
-                if width < engine.theme.sizes.tab_control.tab_control_range.0 {
-                    width = engine.theme.sizes.tab_control.tab_control_range.0;
-                } else if width > engine.theme.sizes.tab_control.tab_control_range.1 {
-                    width = engine.theme.sizes.tab_control.tab_control_range.1;
-                }
-                width
+                Self::calc_width(constraint.max.width, engine.theme)
             }
         };
         LayoutSize::new(width, constraint.max.height)