aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-11-11 16:30:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pr/662: Commands: reject unknown spread values instead of falling back to page 1 (#662)

Browse Source 
# Conflicts:
#	crates/engine/src/cmd/file.rs
#	crates/engine/src/cmd/guides.rs
#	crates/engine/src/cmd/object.rs
This commit is contained in:
aiongg
2026-10-12 23:59:28 +00:00
parent 605b31c6d6 3d59dd5d97
commit 7e4c75fce9
14 changed files with 70 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/edit.rs
+2 -2
View File
@@ -100,7 +100,7 @@ fn outside_text(text: &str) -> Result<String> {
fn paste_text_frame(s: &mut Session, p: &Value, text: &str, slice: Option<&designcraft_doc::Story>) -> Result<Value> {
use designcraft_geom::{Point, Rect, shapes};
const LIMIT: f64 = 1.0e5;
let sr = super::spread_param(p, "spread");
let sr = super::spread_param(p, "edit.paste")?;
let at = super::point_param(p, "at")
.filter(|a| a.x.is_finite() && a.y.is_finite())
.map(|a| Point::new(a.x.clamp(-LIMIT, LIMIT), a.y.clamp(-LIMIT, LIMIT)));
@@ -313,7 +313,7 @@ pub fn specs() -> Vec<CommandSpec> {
return Err(super::bad("edit.paste", "clipboard is empty"));
};
let off = if bool_or(p, "inPlace", false) { 0.0 } else { 12.0 };
let to = super::spread_param(p, "spread");
let to = super::spread_param(p, "edit.paste")?;
let from = s.clipboard_origin;
let ids: Vec<ItemId> = clip.spreads.first().map(|sp| sp.items.iter().map(|i| i.id).collect()).unwrap_or_default();
s.edit(|d, sel| {