more flexible GridAlignMode

Author: yjpark

crates/notation_bevy/src/settings/layout_settings.rs

@@ -27,25 +27,39 @@ impl Default for LayoutMode {
     }
 }
 
+#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
+#[cfg_attr(feature = "inspector", derive(Inspectable))]
+pub enum GridAlignMode {
+    Center,
+    ForceCenter,
+    Top,
+    ForceTop,
+}
+impl Default for GridAlignMode {
+    fn default() -> Self {
+        Self::Center
+    }
+}
+
 #[derive(Clone, Serialize, Deserialize, Debug)]
 #[cfg_attr(feature = "inspector", derive(Inspectable))]
 pub struct LayoutSettings {
     pub mode: LayoutMode,
+    pub grid_align_mode: GridAlignMode,
     pub focus_bar_ease_ms: u64,
     pub focusing_bar_ordinal: usize,
     pub video_recording_mode: bool,
-    pub grid_force_centered: bool,
     pub override_focus_offset_y: Option<f32>,
 }
 
 impl Default for LayoutSettings {
     fn default() -> Self {
         Self {
             mode: LayoutMode::default(),
+            grid_align_mode: GridAlignMode::default(),
             focus_bar_ease_ms: 250,
             focusing_bar_ordinal: usize::MAX,
             video_recording_mode: false,
-            grid_force_centered: false,
             override_focus_offset_y: None,
         }
     }
@@ -154,7 +168,7 @@ impl LayoutSettings {
         let mut y = pos_data.bar_layout.offset.y;
         let grid_size = layout.size;
         let content_size = grid_data.content_size;
-        if self.video_recording_mode {
+        if self.video_recording_mode || self.grid_align_mode == GridAlignMode::ForceTop {
             y += self.override_focus_offset_y.unwrap_or(0.0);
         } else {
             if grid_size.height > content_size.height {
@@ -166,9 +180,12 @@ impl LayoutSettings {
                     y = grid_data.calc_cell_offset(row - 1, col).y;
                 }
                  */
-                y += (grid_size.height - grid_data.margin.height * 2.0 - pos_data.bar_layout.size.height) / 2.0 + self.override_focus_offset_y.unwrap_or(0.0);
-
-                if !self.grid_force_centered {
+                if self.grid_align_mode == GridAlignMode::Center
+                    || self.grid_align_mode == GridAlignMode::ForceCenter {
+                    y += (grid_size.height - grid_data.margin.height * 2.0 - pos_data.bar_layout.size.height) / 2.0 + self.override_focus_offset_y.unwrap_or(0.0);
+                }
+                if self.grid_align_mode != GridAlignMode::ForceCenter
+                    && self.grid_align_mode != GridAlignMode::ForceTop {
                     let min_y = grid_size.height - content_size.height - theme.sizes.layout.page_margin * 2.0;
                     if y < min_y {
                         y = min_y;

crates/notation_bevy/src/viewer/control_view.rs

@@ -11,7 +11,7 @@ use float_eq::float_ne;
 use notation_midi::prelude::{MidiState, PlayControlEvent, MidiSettings, JumpToBarEvent};
 use notation_model::prelude::{Tab, Octave};
 
-use crate::settings::layout_settings::LayoutMode;
+use crate::settings::layout_settings::{LayoutMode, GridAlignMode};
 use crate::ui::layout::NotationLayout;
 use crate::viewer::control::Control;
 
@@ -384,11 +384,43 @@ impl ControlView {
                 Control::toggle_layout_mode(state, settings, theme);
             }
             if !settings.layout.video_recording_mode && settings.layout.mode == LayoutMode::Grid {
-                let last_force_centered = settings.layout.grid_force_centered;
-                ui.checkbox(&mut settings.layout.grid_force_centered, "Force Centered");
-                if settings.layout.grid_force_centered != last_force_centered {
-                    Control::reload_tab(state, theme);
-                }
+                ui.label("Switch Align Mode");
+                ui.horizontal(|ui| {
+                    if settings.layout.grid_align_mode != GridAlignMode::Top {
+                        if ui.button("Top").clicked() {
+                            settings.layout.grid_align_mode = GridAlignMode::Top;
+                            Control::reload_tab(state, theme);
+                        }
+                    } else {
+                        ui.label("Top");
+                    }
+                    if settings.layout.grid_align_mode != GridAlignMode::ForceTop {
+                        if ui.button("Force Top").clicked() {
+                            settings.layout.grid_align_mode = GridAlignMode::ForceTop;
+                            Control::reload_tab(state, theme);
+                        }
+                    } else {
+                        ui.label("Force Top");
+                    }
+                });
+                ui.horizontal(|ui| {
+                    if settings.layout.grid_align_mode != GridAlignMode::Center {
+                        if ui.button("Center").clicked() {
+                            settings.layout.grid_align_mode = GridAlignMode::Center;
+                            Control::reload_tab(state, theme);
+                        }
+                    } else {
+                        ui.label("Center");
+                    }
+                    if settings.layout.grid_align_mode != GridAlignMode::ForceCenter {
+                        if ui.button("Force Center").clicked() {
+                            settings.layout.grid_align_mode = GridAlignMode::ForceCenter;
+                            Control::reload_tab(state, theme);
+                        }
+                    } else {
+                        ui.label("Force Center");
+                    }
+                });
             }
         });
     }