some bugfix with layout mode, and preset settings

yjpark · yjpark · commit f26560e659ac · 2022-01-24T16:58:39.000+08:00
diff --git a/crates/notation_bevy/src/lane/lane_view.rs b/crates/notation_bevy/src/lane/lane_view.rs
@@ -106,7 +106,7 @@ impl LaneView {
                 if !settings.hide_harmony_lane {
                     HarmonyPlugin::insert_lane_extra(&mut commands.entity(lane_entity), lane)
                 }
-                !settings.hide_melody_lane
+                !settings.hide_harmony_lane
             }
             LaneKind::Strings => {
                 if !settings.hide_strings_lane {
diff --git a/crates/notation_bevy/src/notation/control.rs b/crates/notation_bevy/src/notation/control.rs
@@ -9,9 +9,13 @@ use super::events::WindowResizedEvent;
 pub struct Control();
 
 impl Control {
+    pub const PRESET_GUITAR_TAB: &'static str = "guitar_tab";
+    pub const PRESET_GUITAR_NOTES: &'static str = "guitar_notes";
     pub const PRESET_GUITAR_STRINGS: &'static str = "guitar_strings";
     pub const PRESET_MELODY: &'static str = "melody";
-    pub const ALL_PRESETS: [&'static str ; 2 ] = [
+    pub const ALL_PRESETS: [&'static str ; 4 ] = [
+        Self::PRESET_GUITAR_TAB,
+        Self::PRESET_GUITAR_NOTES,
         Self::PRESET_GUITAR_STRINGS,
         Self::PRESET_MELODY,
     ];
@@ -102,6 +106,45 @@ impl Control {
             Self::set_window_size(window, width, height);
         }
     }
+    fn set_preset_strings(
+        settings: &mut NotationSettings,
+        theme: &mut NotationTheme,
+        always_show_fret: bool,
+    ) {
+        settings.hide_strings_lane = false;
+        settings.always_show_fret = always_show_fret;
+        theme.sizes.layout.page_margin = 24.0;
+        theme.sizes.strings.string_space = 20.0;
+        theme.sizes.strings.note_height = 9.0;
+        theme.texts.strings.text_y = -4.0;
+        theme.texts.strings.fret_font_size = 20.0;
+    }
+    fn set_preset_harmony(
+        settings: &mut NotationSettings,
+        theme: &mut NotationTheme,
+    ) {
+        settings.hide_harmony_lane = false;
+        theme.sizes.layout.page_margin = 24.0;
+        theme.sizes.harmony.note_height = 6.0;
+        theme.sizes.harmony.semitone_height = 6.0;
+        theme.texts.harmony.text_y = 9.0;
+        theme.texts.harmony.syllable_font_size = 20.0;
+    }
+    fn set_preset_melody(
+        settings: &mut NotationSettings,
+        theme: &mut NotationTheme,
+        show_melody_pitch: bool,
+    ) {
+        settings.hide_melody_lane = false;
+        settings.show_melody_pitch = show_melody_pitch;
+        settings.show_melody_syllable = true;
+        settings.show_syllable_as_num = true;
+        theme.sizes.layout.page_margin = 24.0;
+        theme.sizes.melody.note_height = 9.0;
+        theme.sizes.melody.semitone_height = 9.0;
+        theme.texts.melody.text_y = -18.0;
+        theme.texts.melody.syllable_font_size = 20.0;
+    }
     pub fn set_preset(
         state: &mut NotationState,
         settings: &mut NotationSettings,
@@ -115,27 +158,23 @@ impl Control {
         #[cfg(not(target_arch = "wasm32"))]
         Self::set_primary_window_size(windows, 1080, 1920);
         match preset {
+            Self::PRESET_GUITAR_TAB => {
+                settings.hack_for_screenshot();
+                Self::set_preset_strings(settings, theme, true);
+                Self::set_preset_harmony(settings, theme);
+                settings.hide_shapes_lane = false;
+            },
+            Self::PRESET_GUITAR_NOTES => {
+                settings.hack_for_screenshot();
+                Self::set_preset_harmony(settings, theme);
+            },
             Self::PRESET_GUITAR_STRINGS => {
                 settings.hack_for_screenshot();
-                settings.hide_strings_lane = false;
-                settings.always_show_fret = true;
-                theme.sizes.layout.page_margin = 24.0;
-                theme.sizes.strings.string_space = 20.0;
-                theme.sizes.strings.note_height = 9.0;
-                theme.texts.strings.fret_font_size = 20.0;
-                theme.texts.strings.text_y = 8.0;
+                Self::set_preset_strings(settings, theme, true);
             },
             Self::PRESET_MELODY => {
                 settings.hack_for_screenshot();
-                settings.hide_melody_lane = false;
-                settings.show_melody_pitch = true;
-                settings.show_melody_syllable = true;
-                settings.show_syllable_as_num = true;
-                theme.sizes.layout.page_margin = 24.0;
-                theme.sizes.melody.note_height = 9.0;
-                theme.sizes.melody.semitone_height = 9.0;
-                theme.texts.melody.text_y = -18.0;
-                theme.texts.melody.syllable_font_size = 20.0;
+                Self::set_preset_melody(settings, theme, true);
             },
             _ => {
                 println!("Control::set_preset() Invalid Preset: {}", preset);
diff --git a/crates/notation_bevy/src/notation/control_panel.rs b/crates/notation_bevy/src/notation/control_panel.rs
@@ -161,6 +161,12 @@ impl ControlPanel {
         CollapsingHeader::new("Display Options")
             .default_open(true)
             .show(ui, |ui| {
+                let mut hide_harmony_lane = settings.hide_harmony_lane;
+                ui.checkbox(&mut hide_harmony_lane, "Hide Guitar Notes");
+                if settings.hide_harmony_lane != hide_harmony_lane {
+                    settings.hide_harmony_lane = hide_harmony_lane;
+                    Control::reload_tab(state, theme);
+                }
                 let mut hide_shapes_lane = settings.hide_shapes_lane;
                 ui.checkbox(&mut hide_shapes_lane, "Hide Guitar Chords");
                 if settings.hide_shapes_lane != hide_shapes_lane {
@@ -173,12 +179,6 @@ impl ControlPanel {
                     settings.hide_strings_lane = hide_strings_lane;
                     Control::reload_tab(state, theme);
                 }
-                let mut hide_harmony_lane = settings.hide_harmony_lane;
-                ui.checkbox(&mut hide_harmony_lane, "Hide Guitar Notes");
-                if settings.hide_harmony_lane != hide_harmony_lane {
-                    settings.hide_harmony_lane = hide_harmony_lane;
-                    Control::reload_tab(state, theme);
-                }
                 let mut hide_lyrics_lane = settings.hide_lyrics_lane;
                 ui.checkbox(&mut hide_lyrics_lane, "Hide Lyrics ");
                 if settings.hide_lyrics_lane != hide_lyrics_lane {
diff --git a/crates/notation_bevy/src/play/play_plugin.rs b/crates/notation_bevy/src/play/play_plugin.rs
@@ -81,12 +81,10 @@ fn update_indicators(
     bar_playing: &BarPlaying,
     bar_layout: LayoutData,
 ) {
-    if settings.hide_indicators {
-        return;
-    }
     let bar_props = bar_playing.bar_props;
     let mut in_bar_pos = None;
     for (entity, mut data) in pos_indicator_query.iter_mut() {
+        data.hidden = settings.hide_indicators;
         data.bar_props = bar_props;
         data.bar_layout = bar_layout;
         data.update(commands, &theme, entity);
@@ -95,6 +93,9 @@ fn update_indicators(
             .focus_bar(commands, theme, tab_bars_query, &data);
         in_bar_pos = Some(data.bar_position.in_bar_pos);
     }
+    if settings.hide_indicators {
+        return;
+    }
     for (entity, mut data) in bar_indicator_query.iter_mut() {
         data.bar_props = bar_props;
         data.bar_layout = bar_layout;
diff --git a/crates/notation_bevy/src/play/pos_indicator.rs b/crates/notation_bevy/src/play/pos_indicator.rs
@@ -7,6 +7,7 @@ use crate::prelude::NotationTheme;
 
 #[derive(Clone, Debug, Component)]
 pub struct PosIndicatorData {
+    pub hidden: bool,
     pub bar_props: TabBarProps,
     pub bar_layout: LayoutData,
     pub bar_units: Units,
@@ -16,6 +17,7 @@ pub struct PosIndicatorData {
 impl PosIndicatorData {
     pub fn new(bar_units: Units) -> Self {
         PosIndicatorData {
+            hidden: false,
             bar_props: TabBarProps::default(),
             bar_layout: LayoutData::ZERO,
             bar_units,
@@ -36,7 +38,11 @@ impl ShapeOp<NotationTheme, OutlineRectangle> for PosIndicatorData {
     fn get_shape(&self, theme: &NotationTheme) -> OutlineRectangle {
         let width = theme.sizes.bar.pos_indicator_size;
         let height = self.bar_layout.size.height + theme.sizes.bar.bar_separator_extra * 2.0;
-        let color = theme.colors.of_section(self.bar_props.section_ordinal);
+        let color = if self.hidden {
+            crate::theme::theme_colors::hex_linear("00000000")
+        } else {
+            theme.colors.of_section(self.bar_props.section_ordinal)
+        };
         let outline_color = theme.colors.bar.pos_indicator_color;
         let outline_width = theme.sizes.bar.pos_indicator_outline;
         let offset = if self.bar_layout.size.width <= 0.0 {
diff --git a/crates/notation_bevy/src/settings/layout_settings.rs b/crates/notation_bevy/src/settings/layout_settings.rs
@@ -176,10 +176,21 @@ impl LayoutSettings {
         let grid_size = layout.size;
         let content_size = grid_data.content_size;
         if self.video_recording_mode || self.grid_align_mode == GridAlignMode::ForceTop {
-            y += self.override_focus_offset_y.unwrap_or(0.0);
+            match self.override_focus_offset_y {
+                Some(offset_y) => {
+                    y += offset_y;
+                },
+                None => {
+                    if grid_size.height > content_size.height {
+                        y += (content_size.height - grid_size.height) / 2.0;
+                    }
+                }
+            }
         } else {
             if grid_size.height > content_size.height {
-                y = -(grid_size.height - content_size.height);
+                if self.grid_align_mode != GridAlignMode::ForceCenter {
+                    y = -(grid_size.height - content_size.height);
+                }
             } else {
                 /* try to show as 2nd row
                 let last_row_height = grid_data.calc_cell_size(row - 1, col).height;
@@ -196,9 +207,7 @@ impl LayoutSettings {
                         / 2.0
                         + self.override_focus_offset_y.unwrap_or(0.0);
                 }
-                if self.grid_align_mode != GridAlignMode::ForceCenter
-                    && self.grid_align_mode != GridAlignMode::ForceTop
-                {
+                if self.grid_align_mode != GridAlignMode::ForceCenter {
                     let min_y = grid_size.height
                         - content_size.height
                         - theme.sizes.layout.page_margin * 2.0;
diff --git a/crates/notation_bevy/src/settings/notation_settings.rs b/crates/notation_bevy/src/settings/notation_settings.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use super::layout_settings::LayoutSettings;
+use super::layout_settings::{LayoutSettings, LayoutMode, GridAlignMode};
 
 #[derive(Clone, Serialize, Deserialize, Debug)]
 pub struct NotationSettings {
@@ -77,6 +77,8 @@ impl NotationSettings {
         self.hide_melody_lane = true;
     }
     pub fn hack_for_screenshot(&mut self) {
+        self.layout.mode = LayoutMode::Grid;
+        self.layout.grid_align_mode = GridAlignMode::ForceTop;
         self.add_ready_section = false;
         self.hide_indicators = true;
         self.hide_guitar_view = true;

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ impl LaneView {`
`106`	`106`	`if !settings.hide_harmony_lane {`
`107`	`107`	`HarmonyPlugin::insert_lane_extra(&mut commands.entity(lane_entity), lane)`
`108`	`108`	`}`
`109`		`- !settings.hide_melody_lane`
	`109`	`+ !settings.hide_harmony_lane`
`110`	`110`	`}`
`111`	`111`	`LaneKind::Strings => {`
`112`	`112`	`if !settings.hide_strings_lane {`