feat: add a separate action to cut the text (#12)

Author: antouhou

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "protextinator"
-version = "0.1.1"
+version = "0.2.0"
 edition = "2021"
 description = "Text management, made simple"
 keywords = ["text", "rendering", "gui", "graphics", "image"]

Cargo.toml

@@ -47,7 +47,9 @@ pub enum ActionResult {
     /// The text content was modified.
     TextChanged,
     /// Text should be inserted into the system clipboard.
-    InsertToClipboard(String),
+    TextCopied(String),
+    /// Text should be inserted into the system clipboard, and the original text was cut.
+    TextCut(String),
     /// Actions are disabled for this text state.
     ActionsDisabled,
 }

src/action.rs

@@ -164,7 +164,7 @@ pub(crate) fn update_buffer(
                 font_system,
                 text_style.font_size.value(),
                 Some(buffer_measurement.x),
-                text_style.wrap.unwrap_or_default().into(),
+                wrap.into(),
                 None,
                 // TODO: what is the default tab width? Make it configurable?
                 2,

src/buffer_utils.rs

@@ -278,10 +278,15 @@ impl<T> TextState<T> {
     pub fn set_text(&mut self, text: &str) {
         self.params.set_text(text);
 
+        // TODO: should we just reset cursor on whole text update?
         if self.cursor.byte_character_start > self.params.text_for_internal_use().len() {
-            self.update_cursor_before_glyph_with_bytes_offset(
-                self.params.text_for_internal_use().len(),
-            );
+            if text.is_empty() {
+                self.cursor = ByteCursor::default()
+            } else {
+                self.update_cursor_before_glyph_with_bytes_offset(
+                    self.params.text_for_internal_use().len(),
+                );
+            }
         }
     }
 
@@ -994,7 +999,7 @@ impl<T> TextState<T> {
 
     fn copy_selected_text(&mut self) -> ActionResult {
         let selected_text = self.selected_text().unwrap_or("");
-        ActionResult::InsertToClipboard(selected_text.to_string())
+        ActionResult::TextCopied(selected_text.to_string())
     }
 
     fn paste_text_at_cursor(&mut self, ctx: &mut TextContext, text: &str) -> ActionResult {
@@ -1018,7 +1023,7 @@ impl<T> TextState<T> {
         let selected_text = self.selected_text().unwrap_or("").to_string();
         self.remove_selected_text();
         self.recalculate_with_update_reason(ctx, UpdateReason::DeletedTextAtCursor);
-        ActionResult::InsertToClipboard(selected_text)
+        ActionResult::TextCut(selected_text)
     }
 
     fn delete_selected_text_or_text_before_cursor(

src/state.rs

@@ -375,6 +375,12 @@ pub enum HorizontalTextAlignment {
     Justify,
 }
 
+impl HorizontalTextAlignment {
+    pub fn is_centered(&self) -> bool {
+        matches!(self, HorizontalTextAlignment::Center)
+    }
+}
+
 impl From<HorizontalTextAlignment> for Option<Align> {
     /// Converts a `TextAlignment` to a [`cosmic_text::Align`] option.
     ///

src/style.rs

@@ -23,7 +23,7 @@ pub fn test_copy_empty_selection() {
 
     // Try to copy with no selection
     let result = text_state.apply_action(&mut ctx, &Action::CopySelectedText);
-    assert!(matches!(result, ActionResult::InsertToClipboard(s) if s.is_empty()));
+    assert!(matches!(result, ActionResult::TextCopied(s) if s.is_empty()));
 }
 
 #[test]
@@ -51,7 +51,7 @@ pub fn test_copy_partial_selection() {
 
     // Copy the selected text
     let result = text_state.apply_action(&mut ctx, &Action::CopySelectedText);
-    assert!(matches!(result, ActionResult::InsertToClipboard(s) if s == "Hello"));
+    assert!(matches!(result, ActionResult::TextCopied(s) if s == "Hello"));
 }
 
 #[test]
@@ -77,8 +77,8 @@ pub fn test_copy_full_selection() {
     // Copy the selected text
     let result = text_state.apply_action(&mut ctx, &Action::CopySelectedText);
     match result {
-        ActionResult::InsertToClipboard(s) => assert_eq!(s, "Hello World"),
-        _ => panic!("Result is {result:?}, expected InsertToClipboard"),
+        ActionResult::TextCopied(s) => assert_eq!(s, "Hello World"),
+        _ => panic!("Result is {result:?}, expected TextCopied"),
     }
 }
 
@@ -107,7 +107,7 @@ pub fn test_copy_cyrillic_text() {
 
     // Copy the selected text
     let result = text_state.apply_action(&mut ctx, &Action::CopySelectedText);
-    assert!(matches!(result, ActionResult::InsertToClipboard(s) if s == "Привет"));
+    assert!(matches!(result, ActionResult::TextCopied(s) if s == "Привет"));
 }
 
 #[test]
@@ -140,7 +140,7 @@ pub fn test_copy_after_editing() {
 
     // Copy the selected text
     let result = text_state.apply_action(&mut ctx, &Action::CopySelectedText);
-    assert!(matches!(result, ActionResult::InsertToClipboard(s) if s == "Test "));
+    assert!(matches!(result, ActionResult::TextCopied(s) if s == "Test "));
 }
 
 #[test]
@@ -199,5 +199,5 @@ pub fn test_copy_selection_from_middle() {
     let result = text_state.apply_action(&mut ctx, &Action::CopySelectedText);
 
     // Verify the copy operation was successful and copied the correct text
-    assert!(matches!(result, ActionResult::InsertToClipboard(s) if s == "bro"));
+    assert!(matches!(result, ActionResult::TextCopied(s) if s == "bro"));
 }