Edit commands animation

Still to be done: undo/redo animation.
PetrGlad · Dec 12, 2023 · 0b5710b · 0b5710b
1 parent d06063d
commit 0b5710b
Show file tree

Hide file tree

Showing 7 changed files with 233 additions and 119 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -117,13 +117,10 @@ impl eframe::App for EmApp {
             if ui.input(|i| i.key_pressed(egui::Key::Space)) {
                 self.toggle_pause();
             }
-            ui.heading(format!(
-                "🌲 {} [{} / {}]",
-                self.stave.history.directory.display(),
-                self.stave.history.version(),
-                self.stave.track_version.to_string()
-            ));
-
+            {
+                let h = self.stave.history.borrow();
+                ui.heading(format!("🌲 {} [{}]", h.directory.display(), h.version()));
+            }
             StripBuilder::new(ui)
                 .size(Size::remainder())
                 .size(Size::exact(20.0))
@@ -182,17 +179,19 @@ impl eframe::App for EmApp {
                                 self.export();
                             }
                             if ui.button("⤵ Undo").clicked() {
-                                self.stave.history.undo(&mut vec![]); // TODO (implement) changes highlighting
+                                self.stave.history.borrow_mut().undo(&mut vec![]);
+                                // TODO (implement) changes highlighting
                             }
                             if ui.button("⤴ Redo").clicked() {
-                                self.stave.history.redo(&mut vec![]); // TODO (implement) changes highlighting
+                                self.stave.history.borrow_mut().redo(&mut vec![]);
+                                // TODO (implement) changes highlighting
                             }
                         });
                         ui.horizontal(|ui| {
                             // Status line
                             ui.label(format!(
                                 "track_len={}  n_sel={}  t_sel={}  at={}s ",
-                                self.stave.history.with_track(|t| t.events.len()),
+                                self.stave.history.borrow().with_track(|t| t.events.len()),
                                 self.stave.note_selection.count(),
                                 self.stave.time_selection.as_ref().map_or(
                                     "()".to_string(),

diff --git a/src/changeset.rs b/src/changeset.rs
@@ -29,6 +29,14 @@ impl EventAction {
         }
     }
 
+    pub fn before(&self) -> Option<&TrackEvent> {
+        match self {
+            EventAction::Delete(ev) => Some(ev),
+            EventAction::Update(ev, _) => Some(ev),
+            EventAction::Insert(_) => None,
+        }
+    }
+
     pub fn after(&self) -> Option<&TrackEvent> {
         match self {
             EventAction::Delete(_) => None,

diff --git a/src/main.rs b/src/main.rs
@@ -65,7 +65,7 @@ pub fn main() {
     }
 
     {
-        let track_midi_source = TrackSource::new(project.history.track.clone());
+        let track_midi_source = TrackSource::new(project.history.borrow().track.clone());
         engine_command_sender
             .send(Box::new(|engine| engine.add(Box::new(track_midi_source))))
             .unwrap();

diff --git a/src/project.rs b/src/project.rs
@@ -1,10 +1,11 @@
+use std::cell::RefCell;
 use std::fs;
 use std::path::PathBuf;
 
 use crate::track_history::TrackHistory;
 
 pub struct Project {
-    pub history: TrackHistory,
+    pub history: RefCell<TrackHistory>,
     pub home_path: PathBuf,
 }
 
@@ -37,7 +38,7 @@ impl Project {
         history.open();
         Project {
             home_path: directory,
-            history,
+            history: RefCell::new(history),
         }
     }
 }