adjust some sizes, improve lyrics display

Author: yjpark

crates/notation_bevy/src/chord/chord_color_background.rs

@@ -0,0 +1,32 @@
+use bevy::prelude::*;
+use notation_bevy_utils::prelude::ColorBackground;
+use notation_model::prelude::Chord;
+
+use crate::prelude::NotationTheme;
+
+#[derive(Clone, Debug)]
+pub struct ChordColorBackground;
+
+impl ChordColorBackground {
+    pub fn spawn(commands: &mut Commands, entity: Entity, z: f32, color: Color) -> Entity {
+        let result = ColorBackground::spawn(
+            commands,
+            entity,
+            z,
+            color,
+        );
+        commands.entity(result).insert(ChordColorBackground);
+        result
+    }
+    pub fn update_color(
+        commands: &mut Commands,
+        theme: &NotationTheme,
+        query: &mut Query<(Entity, &mut ColorBackground), With<ChordColorBackground>>,
+        chord: Option<Chord>,
+    ) {
+        let color = theme.colors.of_option_chord(chord);
+        for (entity, mut background) in query.iter_mut() {
+            background.update_color(commands, entity, color);
+        }
+    }
+}

crates/notation_bevy/src/chord/mod.rs

@@ -6,3 +6,4 @@ pub mod chord_note;
 pub mod chord_playing;
 pub mod chord_view;
 pub mod interval_dot;
+pub mod chord_color_background;

crates/notation_bevy/src/guitar/guitar_view.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use float_eq::float_ne;
 
 use bevy::prelude::*;
-use notation_bevy_utils::prelude::{BevyUtil, ColorBackground, LayoutAnchor, LayoutChangedQuery, LayoutSize, ShapeOp, View, ViewBundle};
+use notation_bevy_utils::prelude::{BevyUtil, LayoutAnchor, LayoutChangedQuery, LayoutSize, ShapeOp, View, ViewBundle};
 use notation_midi::prelude::MidiState;
 use notation_model::prelude::{
     Duration, Entry, HandShape6, Interval, LaneEntry, LaneKind, ModelEntryProps, Pick, Syllable,
@@ -54,12 +54,6 @@ impl GuitarView {
             entity,
             ViewBundle::from(GuitarView::new(tab.clone(), Syllable::default())),
         );
-        ColorBackground::spawn(
-            commands,
-            guitar_entity,
-            theme.core.mini_map_z,
-            theme.core.background_color,
-        );
         let sprite_bundle = SpriteBundle {
             sprite: Sprite::new(Vec2::new(
                 theme.guitar.image_size.0,

crates/notation_bevy/src/play/bar_indicator.rs

@@ -30,15 +30,15 @@ impl ShapeOp<NotationTheme, StrokeRectangle> for BarIndicatorData {
         let offset = if self.bar_layout.size.width <= 0.0 {
             BevyUtil::offscreen_offset()
         } else {
-            let x = self.bar_layout.offset.x;
+            let x = self.bar_layout.offset.x - theme.sizes.bar.bar_separator_size;
             let y = self.bar_layout.offset.y + theme.sizes.bar.bar_separator_extra;
             Vec3::new(x, y, theme.core.bar_indicator_z)
         };
         let color = theme
             .colors
             .of_option_chord(self.chord);
         StrokeRectangle {
-            width: self.bar_layout.size.width,
+            width: self.bar_layout.size.width + theme.sizes.bar.bar_separator_size * 2.0,
             height: self.bar_layout.size.height + theme.sizes.bar.bar_separator_extra * 2.0,
             origin: shapes::RectangleOrigin::TopLeft,
             color, //: theme.colors.bar.bar_indicator,
@@ -74,10 +74,13 @@ impl BarIndicatorData {
         bar_indicator_query: &mut Query<(Entity, &mut BarIndicatorData), With<BarIndicatorData>>,
         bar_props: TabBarProps,
         in_bar_pos: Units,
-    ) {
+    ) -> Option<BarIndicatorData> {
         if let Ok((entity, mut data)) = bar_indicator_query.single_mut() {
             data.update_chord(bar_props, Some(in_bar_pos));
             data.update(commands, theme, entity);
+            Some(data.clone())
+        } else {
+            None
         }
     }
 }

crates/notation_bevy/src/play/play_plugin.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use notation_bevy_utils::prelude::{DoLayoutEvent, GridData, LayoutData, ShapeOp};
+use notation_bevy_utils::prelude::{DoLayoutEvent, GridData, LayoutData, ShapeOp, ColorBackground};
 use notation_midi::prelude::PlayControlEvent;
 use notation_model::prelude::{
     LaneEntry, PlayState, PlayingState, Position, Tab, TickResult,
@@ -10,6 +10,7 @@ use bevy::prelude::*;
 
 use crate::bar::bar_beat::BarBeatData;
 use crate::bar::bar_view::BarView;
+use crate::chord::chord_color_background::ChordColorBackground;
 use crate::chord::chord_playing::ChordPlaying;
 use crate::prelude::{
     BarPlaying, EntryPlaying, NotationAssetsStates, NotationSettings, NotationTheme,
@@ -64,6 +65,7 @@ fn update_indicators(
     commands: &mut Commands,
     theme: &NotationTheme,
     settings: &mut NotationSettings,
+    chord_color_background_query: &mut Query<(Entity, &mut ColorBackground), With<ChordColorBackground>>,
     bar_indicator_query: &mut Query<(Entity, &mut BarIndicatorData), With<BarIndicatorData>>,
     pos_indicator_query: &mut Query<(Entity, &mut PosIndicatorData), With<PosIndicatorData>>,
     tab_bars_query: &mut Query<(
@@ -91,6 +93,7 @@ fn update_indicators(
         data.bar_props = bar_props;
         data.bar_layout = bar_layout;
         data.update_data(commands, theme, entity, bar_props, bar_layout, in_bar_pos);
+        ChordColorBackground::update_color(commands, theme, chord_color_background_query, data.chord);
     }
 }
 
@@ -100,6 +103,7 @@ fn on_tab_resized(
     theme: Res<NotationTheme>,
     mut settings: ResMut<NotationSettings>,
     mut query: Query<(Entity, &BarPlaying, &Arc<BarView>, &LayoutData)>,
+    mut chord_color_background_query: Query<(Entity, &mut ColorBackground), With<ChordColorBackground>>,
     mut bar_indicator_query: Query<(Entity, &mut BarIndicatorData), With<BarIndicatorData>>,
     mut pos_indicator_query: Query<(Entity, &mut PosIndicatorData), With<PosIndicatorData>>,
     mut tab_bars_query: Query<(
@@ -136,6 +140,7 @@ fn on_tab_resized(
                 &mut commands,
                 &theme,
                 &mut settings,
+                &mut chord_color_background_query,
                 &mut bar_indicator_query,
                 &mut pos_indicator_query,
                 &mut tab_bars_query,
@@ -151,6 +156,7 @@ fn on_bar_playing_changed(
     theme: Res<NotationTheme>,
     mut settings: ResMut<NotationSettings>,
     mut query: Query<(Entity, &BarPlaying, &Arc<BarView>, &LayoutData), Changed<BarPlaying>>,
+    mut chord_color_background_query: Query<(Entity, &mut ColorBackground), With<ChordColorBackground>>,
     mut bar_indicator_query: Query<(Entity, &mut BarIndicatorData), With<BarIndicatorData>>,
     mut pos_indicator_query: Query<(Entity, &mut PosIndicatorData), With<PosIndicatorData>>,
     mut tab_bars_query: Query<(
@@ -167,6 +173,7 @@ fn on_bar_playing_changed(
                 &mut commands,
                 &theme,
                 &mut settings,
+                &mut chord_color_background_query,
                 &mut bar_indicator_query,
                 &mut pos_indicator_query,
                 &mut tab_bars_query,
@@ -221,6 +228,7 @@ fn on_tick(
     commands: &mut Commands,
     theme: &NotationTheme,
     settings: &mut NotationSettings,
+    chord_color_background_query: &mut Query<(Entity, &mut ColorBackground), With<ChordColorBackground>>,
     bar_indicator_query: &mut Query<(Entity, &mut BarIndicatorData), With<BarIndicatorData>>,
     pos_indicator_query: &mut Query<(Entity, &mut PosIndicatorData), With<PosIndicatorData>>,
     bar_playing_query: &mut Query<(Entity, &mut BarPlaying), With<BarPlaying>>,
@@ -270,7 +278,9 @@ fn on_tick(
                     .focus_bar(commands, theme, tab_bars_query, &pos_data);
             }
             if chord_changed > 0 {
-                BarIndicatorData::update_pos(commands, theme, bar_indicator_query, pos_data.bar_props, pos_data.bar_position.in_bar_pos);
+                if let Some(bar_data) = BarIndicatorData::update_pos(commands, theme, bar_indicator_query, pos_data.bar_props, pos_data.bar_position.in_bar_pos) {
+                    ChordColorBackground::update_color(commands, theme, chord_color_background_query, bar_data.chord);
+                }
             }
         }
     }
@@ -282,6 +292,7 @@ fn on_play_control_evt(
     mut settings: ResMut<NotationSettings>,
     mut evts: EventReader<PlayControlEvent>,
     mut tab_state_query: Query<(Entity, &mut TabState)>,
+    mut chord_color_background_query: Query<(Entity, &mut ColorBackground), With<ChordColorBackground>>,
     mut bar_indicator_query: Query<(Entity, &mut BarIndicatorData), With<BarIndicatorData>>,
     mut pos_indicator_query: Query<(Entity, &mut PosIndicatorData), With<PosIndicatorData>>,
     mut bar_playing_query: Query<(Entity, &mut BarPlaying), With<BarPlaying>>,
@@ -312,6 +323,7 @@ fn on_play_control_evt(
                     &mut commands,
                     &theme,
                     &mut settings,
+                    &mut chord_color_background_query,
                     &mut bar_indicator_query,
                     &mut pos_indicator_query,
                     &mut bar_playing_query,

crates/notation_bevy/src/tab/tab_bars.rs

@@ -136,7 +136,7 @@ impl TabBars {
             for lane in bar.lanes.iter() {
                 let lane_id = lane.id();
                 if !lane_layouts.contains_key(&lane_id) {
-                    let height = theme.sizes.layout.calc_lane_height(lane.kind);
+                    let height = theme.sizes.calc_lane_height(lane.kind);
                     let margin = theme.sizes.layout.lane_margin;
                     lane_layouts.insert(lane_id, LaneLayoutData::new(&lane, height, margin));
                 }

crates/notation_bevy/src/tab/tab_control.rs

@@ -3,8 +3,9 @@ use std::sync::Arc;
 
 use bevy::prelude::*;
 use notation_bevy_utils::prelude::{BevyUtil, DockPanel, DockSide, DockView, LayoutConstraint, LayoutQuery, LayoutSize, View, ViewBundle, ViewQuery};
-use notation_model::prelude::Tab;
+use notation_model::prelude::{Tab};
 
+use crate::chord::chord_color_background::ChordColorBackground;
 use crate::play::play_panel::PlayPanel;
 use crate::prelude::{NotationAppState, NotationAssets, NotationSettings, NotationTheme, GuitarView};
 use crate::ui::layout::NotationLayout;
@@ -53,6 +54,12 @@ impl TabControl {
         let control = TabControl::new(tab.clone());
         let control_entity =
             BevyUtil::spawn_child_bundle(commands, entity, ViewBundle::from(control));
+        ChordColorBackground::spawn(
+            commands,
+            control_entity,
+            theme.core.mini_map_z,
+            theme.colors.of_syllable(tab.meta.scale.calc_root_syllable()),
+        );
         GuitarView::spawn(commands, materials, assets, theme, control_entity, tab);
         PlayPanel::spawn(
             commands,

crates/notation_bevy/src/theme/lyrics_theme.rs

@@ -1,7 +1,5 @@
 pub mod core_theme;
 pub mod guitar_theme;
-pub mod lyrics_theme;
-pub mod melody_theme;
 pub mod notation_theme;
 pub mod shapes_theme;
 pub mod strings_theme;