Pasted shapes get the next automatic name instead of keeping the original's (fixes #1290)

2026-11-04 09:29:49 -06:00 · 2026-10-24 22:52:52 +02:00
parent 38d2ade2b7
commit 98ce1b35be
3 changed files with 52 additions and 16 deletions
@@ -358,7 +358,15 @@ fn paste(s: &mut Session, p: &Value) -> Result<Value> {
            let mut shapes = clip.shapes.clone();
            reid("edit.paste", doc, &mut shapes)?;
            remap_media(&mut shapes, &media);
-            for sh in &mut shapes {
+            let taken = super::current_shapes(doc, sel).map_or(0, Vec::len);
+            for (k, sh) in shapes.iter_mut().enumerate() {
+                // An automatic name ("Rectangle 3") counts on from this slide, as a new shape would;
+                // a name the user typed stays.
+                let base = super::insert::auto_name_base(sh);
+                let numbered = sh.name.strip_prefix(base.as_str()).and_then(|r| r.strip_prefix(' '));
+                if numbered.is_some_and(|d| !d.is_empty() && d.bytes().all(|b| b.is_ascii_digit())) {
+                    sh.name = format!("{base} {}", taken + k + 1);
+                }
                if let Some(x) = sh.xfrm.as_mut() {
                    x.x += off;
                    x.y += off;