remember state of update_text_position in undo history & fix redo ig

justDeeevin · Apr 2, 2024 · 7362fbf · 7362fbf
1 parent 9293015
commit 7362fbf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/nuhxboard.rs b/src/nuhxboard.rs
@@ -132,6 +132,7 @@ pub enum Change {
     MoveElement{
         index: usize,
         delta: geo::Coord,
+        move_text: bool,
     },
 }
 
@@ -710,21 +711,23 @@ impl Application for NuhxBoard {
                 self.edit_history.push(change);
             }
             Message::Undo => {
+                println!("Undo");
                 if self.history_depth < self.edit_history.len() {
                     self.history_depth += 1;
                     match self.edit_history[self.edit_history.len() - self.history_depth] {
-                        Change::MoveElement { index, delta } => {
-                            self.config.elements[index].translate(-delta, self.update_text_position);
+                        Change::MoveElement { index, delta, move_text } => {
+                            self.config.elements[index].translate(-delta, move_text);
                         }
                     }
                 }
             }
             Message::Redo => {
+                println!("Redo");
                 if self.history_depth > 0 {
                     self.history_depth -= 1;
                     match self.edit_history[self.edit_history.len() - self.history_depth - 1] {
-                        Change::MoveElement { index, delta } => {
-                            self.config.elements[index].translate(delta, self.update_text_position);
+                        Change::MoveElement { index, delta, move_text} => {
+                            self.config.elements[index].translate(delta, move_text);
                         }
                     }
                 }
@@ -822,9 +825,11 @@ impl Application for NuhxBoard {
                 iced::Event::Keyboard(iced::keyboard::Event::KeyPressed { key, location: _, modifiers, text: _ }) => {
                     if modifiers.command() {
                         if key == iced::keyboard::Key::Character(SmolStr::new("z")) {
-                            Some(Message::Undo)
-                        } else if key == iced::keyboard::Key::Character(SmolStr::new("Z")) {
-                            Some(Message::Redo)
+                            if modifiers.shift() {
+                                Some(Message::Redo)
+                            } else {
+                                Some(Message::Undo)
+                            }
                         } else {
                             None
                         }

diff --git a/src/ui/canvas.rs b/src/ui/canvas.rs
@@ -441,6 +441,7 @@ impl canvas::Program<Message> for NuhxBoard {
                             Message::PushChange(Change::MoveElement {
                                 index,
                                 delta: state.delta_accumulator,
+                                move_text: self.update_text_position,
                             })
                         });
                         state.delta_accumulator = Coord::default();