Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge layers-drag: drag layers and objects to reorder them in the Layers panel (#371)

aiongge33cb522483e
diff --cc crates/engine/src/cmd/layout.rs
index ea9bc731d,4a00ce500..4ef987568
--- a/crates/engine/src/cmd/layout.rs
+++ b/crates/engine/src/cmd/layout.rs
@@@ -455,67 -432,13 +455,67 @@@ pub fn specs() -> Vec<CommandSpec>
})
}
),
+ cmd!(
+ "layout.chapterNumbering",
+ "Document Chapter Numbering",
+ [],
+ None,
+ "{style?: arabic|upperRoman|lowerRoman|upperLetters|lowerLetters|arabicLeadingZero|arabicThreeDigits|arabicFourDigits, start?: n (Start Chapter Numbering at), source?: automatic|userDefined|sameAsPrevious} → {chapterNumber, label, style, source, book: the open book holding the document, or null}; no parameters reports the setting",
+ has_doc,
+ |s, p| {
+ if p.as_object().is_none_or(|o| o.is_empty()) {
+ return chapter_numbering(s);
+ }
+ let style = match p.get("style") {
+ Some(v) => match serde_json::from_value::<designcraft_doc::NumberStyle>(v.clone()) {
+ Ok(designcraft_doc::NumberStyle::Symbols) | Err(_) => {
+ return Err(bad("layout.chapterNumbering", format!("unknown chapter style {v}")));
+ }
+ Ok(style) => Some(style),
+ },
+ None => None,
+ };
+ let mut source = match p.get("source") {
+ Some(v) => Some(
+ serde_json::from_value::<designcraft_doc::ChapterSource>(v.clone())
+ .map_err(|_| bad("layout.chapterNumbering", format!("unknown chapter number source {v}")))?,
+ ),
+ None => None,
+ };
+ let start = match p.get("start") {
+ Some(v) => Some(
+ v.as_u64()
+ .filter(|n| (1..=MAX_CHAPTER).contains(n))
+ .ok_or_else(|| bad("layout.chapterNumbering", format!("start: 1 to {MAX_CHAPTER}")))? as u32,
+ ),
+ None => None,
+ };
+ // A start number alone means Start Chapter Numbering at.
+ if start.is_some() && source.is_none() {
+ source = Some(designcraft_doc::ChapterSource::UserDefined);
+ }
+ s.edit(|d, _| {
+ if let Some(style) = style {
+ d.settings.chapter_style = style;
+ }
+ if let Some(source) = source {
+ d.settings.chapter_source = source;
+ }
+ if let Some(n) = start {
+ d.settings.chapter_number = n;
+ }
+ ok()
+ })?;
+ chapter_numbering(s)
+ }
+ ),
cmd!("layer.move", "Move Layer", [], None, "{id, to: index (0 = top/frontmost)}", has_doc, |s, p| {
- let id = LayerId(p.get("id").and_then(Value::as_u64).unwrap_or(0));
- let to = p.get("to").and_then(Value::as_u64).unwrap_or(0) as usize;
+ let id = LayerId(p.get("id").and_then(Value::as_u64).ok_or_else(|| bad("layer.move", "missing id"))?);
+ let to = p.get("to").and_then(Value::as_u64).ok_or_else(|| bad("layer.move", "missing to"))?;
s.edit(|d, _| {
let i = d.layers.iter().position(|l| l.id == id).ok_or_else(|| bad("layer.move", "no such layer"))?;
+ let to = usize::try_from(to).ok().filter(|t| *t < d.layers.len()).ok_or_else(|| bad("layer.move", "to out of range"))?;
let l = d.layers.remove(i);
- let to = to.min(d.layers.len());
d.layers.insert(to, l);
ok()
})