Integration: format

This commit is contained in:
aiongg
2026-10-12 14:52:17 +00:00
parent 58d64f8084
commit b22fb933f8
2 changed files with 7 additions and 3 deletions
+1 -2
View File
@@ -596,8 +596,7 @@ fn load_cursor(s: &mut Session, mut asset: Asset, size: (f64, f64)) -> Result<Va
}
fn place_drop(s: &mut Session, p: &Value) -> Result<Value> {
let crate::LoadedGraphic { asset: aid, size: (nw, nh) } =
s.loaded.ok_or_else(|| bad("place.drop", "nothing loaded in the place cursor"))?;
let crate::LoadedGraphic { asset: aid, size: (nw, nh) } = s.loaded.ok_or_else(|| bad("place.drop", "nothing loaded in the place cursor"))?;
// Undo can remove the loaded graphic's asset.
if !s.doc()?.doc.assets.contains_key(&aid) {
s.loaded = None;
+6 -1
View File
@@ -150,7 +150,12 @@ pub const UI_COMMANDS: &[(&str, &str, Option<&str>, &str)] = &[
"{} — each selected object's fill and stroke colours (and tints) trade places (object.swapFillStroke), or the text's with Formatting Affects Text",
),
("color.toggleFillStroke", "Toggle Fill and Stroke", Some("X"), "{} → {strokeFront} — which of fill and stroke the proxy has in front"),
("color.applyNone", "Apply None", Some("/"), "{} — [None] for the fill or stroke in front of the proxy, of the objects or the text (Formatting Affects Text)"),
(
"color.applyNone",
"Apply None",
Some("/"),
"{} — [None] for the fill or stroke in front of the proxy, of the objects or the text (Formatting Affects Text)",
),
("view.frameEdges", "Show/Hide Frame Edges", Some("Cmd+H"), "{}"),
("view.rulers", "Show/Hide Rulers", Some("Cmd+R"), "{}"),
("view.guides", "Show/Hide Guides", Some("Cmd+;"), "{}"),