daniel543x/figcraft
1
0 Fork 0
mirror of https://github.com/storytold/figcraft.git synced 2026-11-13 05:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into fix/svg-import-stretch-and-dash-offset

Browse Source
This commit is contained in:
Trevor Brown committed 2026-11-03 20:18:56 -05:00
2 parents 8fb53baa64 4bb35d5266
commit 685a3ddae0
101 files changed
+2561 -287
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.lock
Generated
+22 -22
View File
@@ -1763,7 +1763,7 @@ checksum = "b97b65636e5b9ef369943878ac74335ba1c55c1cb6adbf1e2c293c624248d693"
[[package]]
name = "figcraft"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"arboard",
"craft-menu",
@@ -1795,7 +1795,7 @@ dependencies = [
[[package]]
name = "figcraft-cli"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"clap",
"clap_complete",
@@ -1813,7 +1813,7 @@ dependencies = [
[[package]]
name = "figcraft-collab"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -1831,7 +1831,7 @@ dependencies = [
[[package]]
name = "figcraft-collab-net"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"base64 0.22.1",
"figcraft-collab",
@@ -1854,7 +1854,7 @@ dependencies = [
[[package]]
name = "figcraft-color"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"kurbo",
"serde",
@@ -1863,7 +1863,7 @@ dependencies = [
[[package]]
name = "figcraft-doc"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-color",
"figcraft-geom",
@@ -1876,7 +1876,7 @@ dependencies = [
[[package]]
name = "figcraft-engine"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"base64 0.22.1",
"craft-docpath",
@@ -1910,7 +1910,7 @@ dependencies = [
[[package]]
name = "figcraft-format"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-doc",
"figcraft-layout",
@@ -1927,7 +1927,7 @@ dependencies = [
[[package]]
name = "figcraft-geom"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"kurbo",
"serde",
@@ -1935,7 +1935,7 @@ dependencies = [
[[package]]
name = "figcraft-layout"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-doc",
"figcraft-geom",
@@ -1943,7 +1943,7 @@ dependencies = [
[[package]]
name = "figcraft-mcp"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"base64 0.22.1",
"figcraft-collab-net",
@@ -1959,7 +1959,7 @@ dependencies = [
[[package]]
name = "figcraft-pathops"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-doc",
"figcraft-geom",
@@ -1968,7 +1968,7 @@ dependencies = [
[[package]]
name = "figcraft-pdf"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-color",
"figcraft-doc",
@@ -1985,7 +1985,7 @@ dependencies = [
[[package]]
name = "figcraft-plugin"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-color",
"serde",
@@ -1998,7 +1998,7 @@ dependencies = [
[[package]]
name = "figcraft-render"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"crc32fast",
"figcraft-color",
@@ -2017,7 +2017,7 @@ dependencies = [
[[package]]
name = "figcraft-server"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"chrono",
"crc32fast",
@@ -2042,7 +2042,7 @@ dependencies = [
[[package]]
name = "figcraft-svg"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"base64 0.22.1",
"figcraft-color",
@@ -2058,7 +2058,7 @@ dependencies = [
[[package]]
name = "figcraft-text"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"core-text",
"craft-font-catalog",
@@ -2076,7 +2076,7 @@ dependencies = [
[[package]]
name = "figcraft-ui-egui"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"base64 0.22.1",
"chrono",
@@ -2104,7 +2104,7 @@ dependencies = [
[[package]]
name = "figcraft-vectordrawable"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-color",
"figcraft-doc",
@@ -2118,7 +2118,7 @@ dependencies = [
[[package]]
name = "figcraft-web"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"base64 0.22.1",
"eframe",
@@ -6739,7 +6739,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"
[[package]]
name = "xtask"
version = "0.14.0"
version = "0.15.0"
dependencies = [
"figcraft-engine",
"serde_json",
Cargo.toml
+1 -1
View File
@@ -6,7 +6,7 @@ exclude = ["plugins"]
# default-members = ["crates/*", "apps/figcraft", "apps/figcraft-cli", "xtask"]
[workspace.package]
version = "0.14.0"
version = "0.15.0"
edition = "2024"
license = "MIT OR Apache-2.0"
rust-version = "1.95"
contributors/people.toml
+3
View File
@@ -98,3 +98,6 @@ sync_github_name = true
[people.dylanmtaylor]
sync_github_name = true
[people.aleksei-suholita]
real_name = "Oleksii Sukholita"
crates/collab/src/change.rs
+11
View File
@@ -333,6 +333,17 @@ impl Change {
}
impl Entry {
/// The synced list this entry belongs to (`None` for entries kept in maps).
pub(crate) fn family(&self) -> Option<Family> {
match self {
Entry::Style(_) => Some(Family::Styles),
Entry::Comment(_) => Some(Family::Comments),
Entry::Collection(_) => Some(Family::Collections),
Entry::Variable(_) => Some(Family::Variables),
Entry::DevSnapshot(_) | Entry::Image(_) | Entry::Ballot(_) => None,
}
}
/// The client id space the entry's id lies in ([`figcraft_doc::ids`]): ids made during a live
/// session carry their creator's client id, ids from before and ids of other forms are in
/// space 0. `None` for entries keyed by something else (dev snapshots by layer, images by
crates/collab/src/docprops.rs
+123 -29
View File
@@ -54,18 +54,71 @@ struct List<T: Keyed> {
entry: fn(T::Key) -> Entry,
get: fn(&Document) -> &Vec<T>,
get_mut: fn(&mut Document) -> &mut Vec<T>,
/// The list's slot in an [`Index`].
index: fn(&mut Index) -> &mut Option<KeyIndex<T::Key>>,
}
const STYLES: List<Style> =
List { whole: DocProp::Styles, order: DocProp::StyleOrder, entry: Entry::Style, get: |d| &d.styles, get_mut: |d| &mut d.styles };
const COMMENTS: List<Comment> =
List { whole: DocProp::Comments, order: DocProp::CommentOrder, entry: Entry::Comment, get: |d| &d.comments, get_mut: |d| &mut d.comments };
/// Where the entries of each keyed list sit, kept while one batch is applied: a batch can put
/// hundreds of thousands of new entries, and finding each one's place by a scan of the growing
/// list would cost the square of that on the thread every session shares.
#[derive(Default)]
pub(crate) struct Index {
styles: Option<KeyIndex<String>>,
comments: Option<KeyIndex<u64>>,
collections: Option<KeyIndex<String>>,
variables: Option<KeyIndex<String>>,
}
/// The position of the first entry with each key in one list, and the list's length when it was
/// last brought up to date: a list whose length changed since is indexed again.
struct KeyIndex<K> {
at: BTreeMap<K, usize>,
len: usize,
}
impl<K: Ord> KeyIndex<K> {
fn of<T: Keyed<Key = K>>(list: &[T]) -> Self {
let mut at = BTreeMap::new();
for (i, e) in list.iter().enumerate() {
at.entry(e.key()).or_insert(i);
}
KeyIndex { at, len: list.len() }
}
/// The index in `slot`, built again from `list` unless its length and its place for `key`
/// still match the list, so a list changed some other way is never trusted.
fn current<'a, T: Keyed<Key = K>>(slot: &'a mut Option<Self>, list: &[T], key: &K) -> &'a mut Self {
let stale = |ix: &Self| ix.len != list.len() || ix.at.get(key).is_some_and(|&i| list.get(i).is_none_or(|e| e.key() != *key));
if slot.as_ref().is_none_or(stale) {
*slot = Some(KeyIndex::of(list));
}
slot.get_or_insert_with(|| KeyIndex::of(list))
}
}
const STYLES: List<Style> = List {
whole: DocProp::Styles,
order: DocProp::StyleOrder,
entry: Entry::Style,
get: |d| &d.styles,
get_mut: |d| &mut d.styles,
index: |i| &mut i.styles,
};
const COMMENTS: List<Comment> = List {
whole: DocProp::Comments,
order: DocProp::CommentOrder,
entry: Entry::Comment,
get: |d| &d.comments,
get_mut: |d| &mut d.comments,
index: |i| &mut i.comments,
};
const COLLECTIONS: List<Collection> = List {
whole: DocProp::Collections,
order: DocProp::CollectionOrder,
entry: Entry::Collection,
get: |d| &d.variables.collections,
get_mut: |d| &mut d.variables.collections,
index: |i| &mut i.collections,
};
const VARIABLES: List<Variable> = List {
whole: DocProp::Variables,
@@ -73,6 +126,7 @@ const VARIABLES: List<Variable> = List {
entry: Entry::Variable,
get: |d| &d.variables.variables,
get_mut: |d| &mut d.variables.variables,
index: |i| &mut i.variables,
};
impl<T: Keyed> List<T> {
@@ -111,25 +165,53 @@ impl<T: Keyed> List<T> {
Ok(())
}
fn put(&self, doc: &mut Document, key: T::Key, value: &Json) -> Result<(), Error> {
fn put(&self, doc: &mut Document, key: T::Key, value: &Json, index: &mut Index) -> Result<(), Error> {
let t: T = value.read("entry")?;
if t.key() != key {
return Err(Error::Invalid("an entry's id must match the entry it is put at".into()));
}
let list = (self.get_mut)(doc);
match list.iter_mut().find(|e| e.key() == key) {
let ix = KeyIndex::current((self.index)(index), list, &key);
match ix.at.get(&key).copied().and_then(|i| list.get_mut(i)) {
Some(e) => *e = t,
None => list.push(t),
None => {
list.push(t);
ix.at.insert(key, list.len() - 1);
ix.len = list.len();
}
}
Ok(())
}
fn remove(&self, doc: &mut Document, key: &T::Key) {
(self.get_mut)(doc).retain(|e| e.key() != *key);
fn remove(&self, doc: &mut Document, key: &T::Key, index: &mut Index) {
let list = (self.get_mut)(doc);
let slot = (self.index)(index);
let ix = KeyIndex::current(slot, list, key);
// An absent entry leaves the list as it is, without a scan of it.
let Some(at) = ix.at.get(key).copied() else {
return;
};
let before = list.len();
list.retain(|e| e.key() != *key);
// One entry gone at `at`: the index is kept current by shifting the entries after it down,
// so the next removal in the batch need not index the list again. Duplicates of the key
// (more than one entry gone) leave it to be rebuilt.
if list.len() + 1 == before {
ix.at.remove(key);
for i in ix.at.values_mut() {
if *i > at {
*i -= 1;
}
}
ix.len = list.len();
} else {
*slot = None;
}
}
/// Entries in `keys` order first, the rest after in their current order.
fn reorder(&self, doc: &mut Document, value: &Json) -> Result<(), Error> {
fn reorder(&self, doc: &mut Document, value: &Json, index: &mut Index) -> Result<(), Error> {
*(self.index)(index) = None;
let keys: Vec<T::Key> = value.read("order")?;
let list = (self.get_mut)(doc);
let mut slots: Vec<Option<T>> = std::mem::take(list).into_iter().map(Some).collect();
@@ -150,7 +232,8 @@ impl<T: Keyed> List<T> {
Ok(())
}
fn set_whole(&self, doc: &mut Document, value: &Json) -> Result<(), Error> {
fn set_whole(&self, doc: &mut Document, value: &Json, index: &mut Index) -> Result<(), Error> {
*(self.index)(index) = None;
*(self.get_mut)(doc) = value.read("list")?;
Ok(())
}
@@ -313,31 +396,38 @@ pub(crate) fn diff(a: &Document, b: &Document, out: &mut Vec<Change>) -> Result<
diff_map(&a.votes, &b.votes, |x, y| x == y, |k| Entry::Ballot(k.clone()), Json::of, out)
}
/// Apply a document-level change. Returns whether it can change which pages are listed (the
/// library store page is never listed).
/// [`apply_indexed`] for one change on its own.
#[cfg(test)]
pub(crate) fn apply(doc: &mut Document, change: &Change) -> Result<bool, Error> {
apply_indexed(doc, change, &mut Index::default())
}
/// Apply a document-level change, with the keyed lists' positions kept in `index` between the
/// changes of one batch. Returns whether it can change which pages are listed (the library store
/// page is never listed).
pub(crate) fn apply_indexed(doc: &mut Document, change: &Change, index: &mut Index) -> Result<bool, Error> {
match change {
Change::SetDoc { prop, value } => {
if set_scalar(doc, *prop, value)? {
return Ok(*prop == DocProp::Libraries);
}
match prop {
DocProp::Styles => STYLES.set_whole(doc, value),
DocProp::StyleOrder => STYLES.reorder(doc, value),
DocProp::Comments => COMMENTS.set_whole(doc, value),
DocProp::CommentOrder => COMMENTS.reorder(doc, value),
DocProp::Collections => COLLECTIONS.set_whole(doc, value),
DocProp::CollectionOrder => COLLECTIONS.reorder(doc, value),
DocProp::Variables => VARIABLES.set_whole(doc, value),
DocProp::VariableOrder => VARIABLES.reorder(doc, value),
DocProp::Styles => STYLES.set_whole(doc, value, index),
DocProp::StyleOrder => STYLES.reorder(doc, value, index),
DocProp::Comments => COMMENTS.set_whole(doc, value, index),
DocProp::CommentOrder => COMMENTS.reorder(doc, value, index),
DocProp::Collections => COLLECTIONS.set_whole(doc, value, index),
DocProp::CollectionOrder => COLLECTIONS.reorder(doc, value, index),
DocProp::Variables => VARIABLES.set_whole(doc, value, index),
DocProp::VariableOrder => VARIABLES.reorder(doc, value, index),
_ => Err(Error::Invalid(format!("{prop:?} is not a list"))),
}?;
}
Change::Put { entry, value } => match entry {
Entry::Style(k) => STYLES.put(doc, k.clone(), value)?,
Entry::Comment(k) => COMMENTS.put(doc, *k, value)?,
Entry::Collection(k) => COLLECTIONS.put(doc, k.clone(), value)?,
Entry::Variable(k) => VARIABLES.put(doc, k.clone(), value)?,
Entry::Style(k) => STYLES.put(doc, k.clone(), value, index)?,
Entry::Comment(k) => COMMENTS.put(doc, *k, value, index)?,
Entry::Collection(k) => COLLECTIONS.put(doc, k.clone(), value, index)?,
Entry::Variable(k) => VARIABLES.put(doc, k.clone(), value, index)?,
Entry::DevSnapshot(k) => {
let snap: DevSnapshot = value.read("dev snapshot")?;
doc.dev_snapshots.insert(*k, Arc::new(snap));
@@ -351,14 +441,18 @@ pub(crate) fn apply(doc: &mut Document, change: &Change) -> Result<bool, Error>
}
},
Change::Remove { entry } => match entry {
Entry::Style(k) => STYLES.remove(doc, k),
Entry::Comment(k) => COMMENTS.remove(doc, k),
Entry::Collection(k) => COLLECTIONS.remove(doc, k),
Entry::Variable(k) => VARIABLES.remove(doc, k),
Entry::Style(k) => STYLES.remove(doc, k, index),
Entry::Comment(k) => COMMENTS.remove(doc, k, index),
Entry::Collection(k) => COLLECTIONS.remove(doc, k, index),
Entry::Variable(k) => VARIABLES.remove(doc, k, index),
Entry::DevSnapshot(k) => {
doc.dev_snapshots.remove(k);
}
Entry::Image(k) => {
// Nothing to remove: no need to look through the document for what shows it.
if !doc.images.contains_key(k) {
return Ok(false);
}
// An image a layer or style shows stays: removing it would let other bytes go
// under its key, swapping the picture that layer shows ([`image_for`]).
if figcraft_doc::used_images(doc).contains(k) {
crates/collab/src/keyed_list_tests.rs
+132
View File
@@ -0,0 +1,132 @@
//! Keyed document lists (comments, styles, variables, collections) applied in large batches: a
//! batch of new entries is placed through an index, not a scan of the growing list per entry, and
//! puts, removes and reorders in one batch still leave the list a scan would.
use figcraft_doc::{Comment, Document, Message};
use crate::change::{Change, DocProp, Entry, Json};
use crate::{Mode, Replica};
fn comment(id: u64, text: &str, doc: &Document) -> Comment {
let page = doc.first_page().unwrap();
Comment { id, page, x: 1.0, y: 2.0, anchor: None, first: Message::new("A", text, 0), resolved: false, replies: Vec::new(), read_by: None }
}
fn put(c: &Comment) -> Change {
Change::Put { entry: Entry::Comment(c.id), value: Json::of(c).unwrap() }
}
#[test]
fn a_large_batch_of_new_comments_lands_whole_and_in_order() {
let doc = Document::new("t");
let changes: Vec<Change> = (1..=100_000).map(|i| put(&comment(i, "hi", &doc))).collect();
let mut r = Replica::new(doc);
// A scan per put took minutes here; indexed it takes well under a second, even unoptimised.
r.apply(&changes, Mode::Strict).unwrap();
assert_eq!(r.document().comments.len(), 100_000);
assert!(r.document().comments.iter().zip(1..).all(|(c, i)| c.id == i));
}
#[test]
fn puts_removes_and_reorders_in_one_batch_match_one_by_one() {
let doc = Document::new("t");
let c = |i, t| comment(i, t, &doc);
let batch = vec![
put(&c(1, "a")),
put(&c(2, "b")),
put(&c(3, "c")),
// Replaced in place.
put(&c(2, "B")),
Change::Remove { entry: Entry::Comment(1) },
// Absent: nothing changes.
Change::Remove { entry: Entry::Comment(9) },
put(&c(4, "d")),
put(&c(6, "f")),
// Two removals in a row: the second goes through the index the first kept current.
Change::Remove { entry: Entry::Comment(2) },
Change::Remove { entry: Entry::Comment(6) },
put(&c(2, "B")),
put(&c(3, "C")),
Change::SetDoc { prop: DocProp::CommentOrder, value: Json::of(&[4u64, 3, 2]).unwrap() },
put(&c(2, "BB")),
put(&c(1, "again")),
Change::SetDoc { prop: DocProp::Comments, value: Json::of(&vec![c(7, "x"), c(8, "y")]).unwrap() },
put(&c(8, "Y")),
put(&c(5, "e")),
];
let mut together = Replica::new(doc.clone());
together.apply(&batch, Mode::Strict).unwrap();
let mut one_by_one = Replica::new(doc.clone());
for ch in &batch {
one_by_one.apply(std::slice::from_ref(ch), Mode::Strict).unwrap();
}
assert_eq!(together.document().comments, one_by_one.document().comments);
let got: Vec<(u64, &str)> = together.document().comments.iter().map(|c| (c.id, c.first.text.as_str())).collect();
assert_eq!(got, vec![(7, "x"), (8, "Y"), (5, "e")]);
}
#[test]
fn removing_an_absent_image_does_not_fail() {
let mut doc = Document::new("t");
let remove = Change::Remove { entry: Entry::Image("missing".into()) };
assert!(!crate::docprops::apply(&mut doc, &remove).unwrap());
}
#[test]
fn removals_in_one_batch_keep_the_index_current() {
let doc = Document::new("t");
let c = |i, t| comment(i, t, &doc);
let batch = vec![
put(&c(1, "a")),
put(&c(2, "b")),
put(&c(3, "c")),
put(&c(4, "d")),
put(&c(5, "e")),
Change::Remove { entry: Entry::Comment(2) },
Change::Remove { entry: Entry::Comment(9) },
Change::Remove { entry: Entry::Comment(4) },
// Replaced where the shifted index says they now are.
put(&c(5, "E")),
put(&c(3, "C")),
put(&c(1, "A")),
Change::Remove { entry: Entry::Comment(1) },
put(&c(2, "B")),
put(&c(5, "EE")),
];
let mut together = Replica::new(doc.clone());
together.apply(&batch, Mode::Strict).unwrap();
let mut one_by_one = Replica::new(doc.clone());
for ch in &batch {
one_by_one.apply(std::slice::from_ref(ch), Mode::Strict).unwrap();
}
assert_eq!(together.document().comments, one_by_one.document().comments);
let got: Vec<(u64, &str)> = together.document().comments.iter().map(|c| (c.id, c.first.text.as_str())).collect();
assert_eq!(got, vec![(3, "C"), (5, "EE"), (2, "B")]);
}
#[test]
fn duplicate_keys_from_a_whole_list_match_one_by_one() {
let doc = Document::new("t");
let c = |i, t| comment(i, t, &doc);
let batch = vec![
Change::SetDoc { prop: DocProp::Comments, value: Json::of(&vec![c(1, "a"), c(2, "b"), c(2, "b2"), c(3, "c"), c(4, "d")]).unwrap() },
// The first entry with the key is the one replaced, as a scan finds it.
put(&c(2, "B")),
put(&c(4, "D")),
// Both entries with the key go: the index is built again for what follows.
Change::Remove { entry: Entry::Comment(2) },
put(&c(3, "C")),
Change::Remove { entry: Entry::Comment(1) },
put(&c(2, "again")),
put(&c(4, "DD")),
];
let mut together = Replica::new(doc.clone());
together.apply(&batch, Mode::Lenient).unwrap();
let mut one_by_one = Replica::new(doc.clone());
for ch in &batch {
one_by_one.apply(std::slice::from_ref(ch), Mode::Lenient).unwrap();
}
assert_eq!(together.document().comments, one_by_one.document().comments);
let got: Vec<(u64, &str)> = together.document().comments.iter().map(|c| (c.id, c.first.text.as_str())).collect();
assert_eq!(got, vec![(3, "C"), (4, "DD"), (2, "again")]);
}
crates/collab/src/lib.rs
+2
View File
@@ -148,6 +148,8 @@ mod image_tests;
#[cfg(test)]
mod journal_tests;
#[cfg(test)]
mod keyed_list_tests;
#[cfg(test)]
mod merge_list_tests;
#[cfg(test)]
mod merge_tests;
crates/collab/src/replica.rs
+4 -3
View File
@@ -192,8 +192,9 @@ impl Replica {
self.doc.take_dirty();
let mut out = Applied::default();
let (mut relist, mut relist_all) = (BTreeSet::new(), false);
let mut index = docprops::Index::default();
for c in changes {
match self.apply_one(c, &mut out) {
match self.apply_one(c, &mut out, &mut index) {
Ok(Relist::No) => {}
Ok(Relist::Page(p)) => {
relist.insert(p);
@@ -214,7 +215,7 @@ impl Replica {
}
/// Apply one change. Returns what of the page list needs rebuilding.
fn apply_one(&mut self, c: &Change, out: &mut Applied) -> Result<Relist, Error> {
fn apply_one(&mut self, c: &Change, out: &mut Applied, index: &mut docprops::Index) -> Result<Relist, Error> {
match c {
Change::Create { id, kind, parent, position, props } => {
frac::validate(position).map_err(|e| Error::Invalid(e.to_string()))?;
@@ -297,7 +298,7 @@ impl Replica {
Ok(if page { Relist::Page(*id) } else { Relist::No })
}
Change::SetDoc { .. } | Change::Put { .. } | Change::Remove { .. } => {
Ok(if docprops::apply(&mut self.doc, c)? { Relist::All } else { Relist::No })
Ok(if docprops::apply_indexed(&mut self.doc, c, index)? { Relist::All } else { Relist::No })
}
}
}
crates/collab/src/server.rs
+10 -4
View File
@@ -6,7 +6,7 @@ use std::collections::{BTreeMap, BTreeSet, VecDeque};
use figcraft_doc::{Document, NodeId};
use serde::{Deserialize, Serialize};
use crate::change::{Change, Entry, Prop, Target};
use crate::change::{Change, Entry, Family, Prop, Target};
use crate::message::{
Accepted, Access, CatchUp, ClientMsg, Hello, PROTOCOL, Peer, Presence, Processed, Resume, ServerMsg, Signal, reads_comments, reads_signals,
};
@@ -557,6 +557,7 @@ impl Server {
fn check_entries(&self, from: u32, changes: &[Change], after: &Document) -> Result<Vec<(Entry, bool)>, Error> {
let before = self.state.document();
let mut touched: BTreeSet<Entry> = BTreeSet::new();
let mut listed: BTreeMap<Family, (BTreeSet<Entry>, BTreeSet<Entry>)> = BTreeMap::new();
for c in changes {
match c {
Change::Put { entry, .. } | Change::Remove { entry } if entry.id_space().is_some() => {
@@ -565,8 +566,10 @@ impl Server {
// A whole list replaced (the fallback for lists whose ids aren't unique).
Change::SetDoc { prop, .. } => {
if let Some(Ok(family)) = prop.list() {
touched.extend(docprops::entries(before, family));
touched.extend(docprops::entries(after, family));
let (b, a) = (docprops::entries(before, family), docprops::entries(after, family));
touched.extend(b.iter().chain(&a).cloned());
// Looked up in sets below: a linear search per entry would be quadratic.
listed.entry(family).or_insert_with(|| (b.into_iter().collect(), a.into_iter().collect()));
}
}
_ => {}
@@ -574,7 +577,10 @@ impl Server {
}
let mut out = Vec::new();
for entry in touched {
let (was, now) = (docprops::has(before, &entry), docprops::has(after, &entry));
let (was, now) = match entry.family().and_then(|f| listed.get(&f)) {
Some((b, a)) => (b.contains(&entry), a.contains(&entry)),
None => (docprops::has(before, &entry), docprops::has(after, &entry)),
};
if was == now {
continue;
}
crates/color/src/lib.rs
+24 -18
View File
@@ -376,26 +376,32 @@ impl Gradient {
s
}
/// The colour at `t` (0..1) along the gradient.
/// The colour at `t` (0..1) along the gradient. Sorts the stops on every call: to sample one
/// gradient many times, sort once with [`Self::sorted_stops`] and use [`sample_sorted`].
pub fn sample(&self, t: f32) -> Color {
let stops = self.sorted_stops();
let t = clamp01(t);
let mut prev = match stops.first() {
Some(s) => *s,
None => return Color::BLACK,
};
if t <= prev.position {
return prev.color;
sample_sorted(&self.sorted_stops(), t)
}
}
/// The colour at `t` (0..1) along stops already sorted by [`Gradient::sorted_stops`]: found by a
/// binary search, so a renderer sampling a file's gradient per pixel doesn't scan or sort its
/// stops each time.
pub fn sample_sorted(stops: &[ColorStop], t: f32) -> Color {
let t = clamp01(t);
let Some(first) = stops.first() else { return Color::BLACK };
if t <= first.position {
return first.color;
}
// The first stop after the first one at or past `t`, and the stop before it.
let rest = stops.get(1..).unwrap_or_default();
let i = rest.partition_point(|s| s.position < t);
match (rest.get(i), stops.get(i)) {
(Some(s), Some(prev)) => {
let span = s.position - prev.position;
let f = if span > 1e-6 { (t - prev.position) / span } else { 1.0 };
prev.color.lerp(s.color, f)
}
for s in stops.iter().skip(1) {
if t <= s.position {
let span = s.position - prev.position;
let f = if span > 1e-6 { (t - prev.position) / span } else { 1.0 };
return prev.color.lerp(s.color, f);
}
prev = *s;
}
prev.color
_ => stops.last().map_or(Color::BLACK, |s| s.color),
}
}
crates/color/src/tests.rs
+38
View File
@@ -59,6 +59,44 @@ fn gradient_sampling() {
assert_eq!(g.sample(0.5).to_hex(), "808080");
}
#[test]
fn sampling_sorted_stops_matches_a_scan() {
// The scan `sample` used to make: the first stop at or past `t`, mixed with the one before.
fn scan(stops: &[ColorStop], t: f32) -> Color {
let t = if t.is_nan() { 0.0 } else { t.clamp(0.0, 1.0) };
let mut prev = stops[0];
if t <= prev.position {
return prev.color;
}
for s in &stops[1..] {
if t <= s.position {
let span = s.position - prev.position;
let f = if span > 1e-6 { (t - prev.position) / span } else { 1.0 };
return prev.color.lerp(s.color, f);
}
prev = *s;
}
prev.color
}
let grey = |v: f32| Color { r: v, g: v, b: v, a: 1.0 };
let positions = [0.3, 0.0, 0.3, 1.0, 0.7, f32::NAN, 0.5, 0.5, 0.9];
let g = Gradient {
kind: GradientKind::Diamond,
stops: positions.iter().enumerate().map(|(i, p)| ColorStop { position: *p, color: grey(i as f32 / 10.0) }).collect(),
from: (0.5, 0.5),
to: (1.0, 0.5),
width: (0.5, 1.0),
};
let sorted = g.sorted_stops();
for i in -10..=110 {
let t = i as f32 / 100.0;
assert_eq!(sample_sorted(&sorted, t), scan(&sorted, t), "t = {t}");
assert_eq!(g.sample(t), scan(&sorted, t), "t = {t}");
}
assert_eq!(sample_sorted(&sorted, f32::NAN), scan(&sorted, f32::NAN));
assert_eq!(sample_sorted(&[], 0.5), Color::BLACK);
}
#[test]
fn paint_serde_shape() {
let p = Paint::solid(Color::from_hex("FF0000").unwrap());
crates/doc/src/lib.rs
+13
View File
@@ -574,6 +574,19 @@ impl Document {
Ok(())
}
/// Remove every child of `id` with its subtree, in one pass over `id`'s child list (removing
/// them one by one would search that list once per child).
pub fn remove_children(&mut self, id: NodeId) -> DocResult<()> {
let kids = std::mem::take(&mut self.get_mut(id)?.children);
for c in kids {
for d in self.subtree(c) {
self.nodes.remove(&d);
self.dirty.touch(d);
}
}
Ok(())
}
/// Whether sections may go in `parent`: a page or another section (never a frame or a group).
pub fn takes_sections(&self, parent: NodeId) -> bool {
self.node(parent).is_some_and(|p| p.is_page() || matches!(p.kind, NodeKind::Section { .. }))
crates/doc/src/tests.rs
+14
View File
@@ -846,3 +846,17 @@ fn the_colour_walker_visits_calculation_literals() {
let ColorOperand::Literal { literal } = from else { panic!("literal operand") };
assert_eq!(literal.a, 0.5, "the mix's stored literal was converted like every other colour");
}
#[test]
fn remove_children_removes_every_subtree_and_keeps_the_parent() {
let mut doc = Document::new("T");
let page = doc.first_page().unwrap();
let frame = doc.create(page, NodeKind::Frame, "F", 0.0, 0.0, 100.0, 100.0).unwrap();
let inner = doc.create(frame, NodeKind::Frame, "Inner", 0.0, 0.0, 10.0, 10.0).unwrap();
let leaf = doc.create(inner, NodeKind::Rectangle, "Leaf", 0.0, 0.0, 5.0, 5.0).unwrap();
let other = doc.create(page, NodeKind::Rectangle, "Other", 0.0, 0.0, 5.0, 5.0).unwrap();
doc.remove_children(frame).unwrap();
assert!(doc.contains(frame) && doc.contains(other));
assert!(!doc.contains(inner) && !doc.contains(leaf));
assert!(doc.get(frame).unwrap().children.is_empty());
}
crates/doc/src/text.rs
+41 -5
View File
@@ -234,6 +234,22 @@ pub enum LeadingTrim {
CapHeight,
}
/// Where lines break when text wraps to more than one line ("Wrap style controls where lines
/// break when text wraps to more than one line", Explore text properties).
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
pub enum WrapStyle {
/// "Figma fits as many words as possible on each line before wrapping to the next."
#[default]
Auto,
/// "Figma distributes text as evenly as possible across every line, so each line is close to
/// the same length."
Balance,
/// "Figma keeps each line full, but adjusts the last four lines to avoid an orphan -- a single
/// word stranded alone on the last line."
Pretty,
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
#[serde(rename_all = "camelCase")]
pub enum ListStyle {
@@ -251,7 +267,10 @@ pub const MAX_LIST_INDENT: u8 = 8;
#[serde(default)]
pub struct ParaList {
pub list: ListStyle,
/// Nesting level (0 = outermost; plain paragraphs are always 0).
/// Nesting level (0 = outermost). A plain paragraph is 0, except one that left its list by
/// Backspace or Delete at its start ([`TextData::unlist_keeping_levels`]): it keeps the level
/// it had and starts where that level's item text does ("delete the counter, but keep the
/// same level of indentation").
pub indent: u8,
/// A numbered list that starts counting at this paragraph counts from `start_offset + 1`
/// (items that go on counting ignore it; other paragraphs are always 0).
@@ -463,6 +482,10 @@ pub struct TextData {
/// as fit).
#[serde(skip_serializing_if = "crate::node::is_default")]
pub max_lines: u32,
/// Where lines break when the text wraps: greedily (Auto), as evenly as the words allow
/// (Balance), or full with no one word alone on the last line (Pretty).
#[serde(skip_serializing_if = "crate::node::is_default")]
pub wrap_style: WrapStyle,
/// OpenType feature toggles (e.g. "liga": false).
#[serde(skip_serializing_if = "crate::node::is_default")]
pub features: std::collections::BTreeMap<String, bool>,
@@ -606,12 +629,14 @@ impl TextData {
}
/// Whether text that runs out of room ends in an ellipsis: a truncating box, or auto height
/// with a line limit (the box hugs up to `max_lines` lines).
/// or auto width with a line limit (the box hugs up to `max_lines` lines: "Max lines is
/// available only if truncate text is enabled, and: Text resizing is set to auto height or
/// auto width").
pub fn truncates(&self) -> bool {
match self.auto_resize {
TextAutoResize::Truncate => true,
TextAutoResize::Height => self.max_lines > 0,
TextAutoResize::WidthAndHeight | TextAutoResize::None => false,
TextAutoResize::Height | TextAutoResize::WidthAndHeight => self.max_lines > 0,
TextAutoResize::None => false,
}
}
@@ -798,11 +823,22 @@ impl TextData {
/// paragraphs stay at level 0, only numbered ones keep a start, levels stop at
/// [`MAX_LIST_INDENT`]); one style for all with no nesting or start folds back into `list`.
pub fn set_para_lists(&mut self, start: usize, end: usize, f: impl Fn(&mut ParaList)) {
self.set_para_lists_with(start, end, false, f);
}
/// Take the list items among the paragraphs chars `start..end` touch out of their list at the
/// level they had, as Backspace or Delete at an item's start does: "delete the counter, but
/// keep the same level of indentation" (Create bulleted and numbered lists).
pub fn unlist_keeping_levels(&mut self, start: usize, end: usize) {
self.set_para_lists_with(start, end, true, |pl| pl.list = ListStyle::None);
}
fn set_para_lists_with(&mut self, start: usize, end: usize, keep_levels: bool, f: impl Fn(&mut ParaList)) {
let (a, b) = self.para_span(start, end);
self.fill_paragraphs();
for pl in self.paragraphs.get_mut(a..=b).unwrap_or(&mut []) {
f(pl);
if pl.list == ListStyle::None {
if pl.list == ListStyle::None && !keep_levels {
pl.indent = 0;
}
if pl.list != ListStyle::Numbered {
crates/engine/src/al_behaviour_tests.rs
+60
View File
@@ -72,6 +72,52 @@ fn fill_on_a_child_turns_the_hugging_parent_fixed() {
assert_eq!(sizing(&s, f), (Sizing::Hug, Sizing::Hug));
}
#[test]
fn a_child_resized_to_the_full_available_space_becomes_fill() {
// Documented: "Child objects of an auto layout frame will also be set to Fill container if
// they are manually resized to the full available space of the parent frame."
let mut s = Session::new();
let f = al_frame(&mut s, json!({"padding": 10, "gap": 10})); // 200 × 100, fixed
let a = rect(&mut s, f, 50.0, 20.0, "#FF0000");
// Along the flow, alone in the frame: its width less the padding (200 - 20).
s.execute("transform.resize", &json!({"ids": [a], "width": 180})).unwrap();
assert_eq!(sizing(&s, a), (Sizing::Fill, Sizing::Fixed));
assert_eq!(size(&s, a), (180.0, 20.0));
s.undo().unwrap();
assert_eq!(sizing(&s, a), (Sizing::Fixed, Sizing::Fixed), "undone as part of the edit");
// Across the flow, beside a sibling too: the frame's height less its padding.
let b = rect(&mut s, f, 50.0, 20.0, "#0000FF");
set(&mut s, b, json!({"height": 80}));
assert_eq!(sizing(&s, b), (Sizing::Fixed, Sizing::Fill));
assert_eq!(size(&s, b), (50.0, 80.0));
// Short of it: fixed, as before.
set(&mut s, b, json!({"height": 70}));
assert_eq!(sizing(&s, b), (Sizing::Fixed, Sizing::Fixed));
// Along the flow beside a sibling, what is left is not "the full available space": a width
// that happens to match it (180 - 10 - 50) stays fixed.
s.execute("transform.resize", &json!({"ids": [b], "width": 120})).unwrap();
assert_eq!(sizing(&s, b), (Sizing::Fixed, Sizing::Fixed));
// A hugging frame has no full space to offer: the child stays fixed.
let g = al_frame(&mut s, json!({"sizingH": "hug", "sizingV": "hug", "padding": 10}));
let c = rect(&mut s, g, 50.0, 20.0, "#00FF00");
set(&mut s, c, json!({"width": 180}));
assert_eq!(sizing(&s, c), (Sizing::Fixed, Sizing::Fixed));
// An inside stroke the layout includes takes room like the padding: the full space is what
// layout leaves the child (200 - 2 × 10 - 2 × 4), not the frame less its padding alone.
let h = al_frame(&mut s, json!({"padding": 10, "strokesIncluded": true, "stroke": "#000000", "strokeWeight": 4, "strokeAlign": "inside"}));
let d = rect(&mut s, h, 50.0, 20.0, "#FF0000");
set(&mut s, d, json!({"width": 180}));
assert_eq!(sizing(&s, d), (Sizing::Fixed, Sizing::Fixed), "wider than the room the stroke leaves");
assert_eq!(size(&s, d), (180.0, 20.0), "and kept as typed");
set(&mut s, d, json!({"width": 172}));
assert_eq!(sizing(&s, d), (Sizing::Fill, Sizing::Fixed));
assert_eq!(size(&s, d), (172.0, 20.0));
// Excluded from the layout, the stroke takes no room: the frame less its padding again.
set(&mut s, h, json!({"strokesIncluded": false}));
set(&mut s, d, json!({"width": 172}));
assert_eq!(sizing(&s, d), (Sizing::Fixed, Sizing::Fixed));
}
#[test]
fn hug_and_fill_only_where_they_apply() {
// Documented: Hug applies to auto layout frames (and text); Fill to children of auto layout,
@@ -232,6 +278,20 @@ fn a_size_given_with_a_new_path_fixes_that_axis() {
set(&mut s, v, json!({"path": "M0 0 L20 5", "width": 30}));
assert_eq!(sizing(&s, v).0, Sizing::Fixed);
assert!((size(&s, v).0 - 30.0).abs() < 1e-6, "{:?}", size(&s, v));
// The axis is judged by the size the path is given, not the one before it: the frame's full
// height (100) given with a path fills; a smaller height given with the next path is fixed,
// though the layer filled the frame until then.
set(&mut s, v, json!({"path": "M0 0 L20 5", "height": 100}));
assert_eq!(sizing(&s, v).1, Sizing::Fill);
assert!((size(&s, v).1 - 100.0).abs() < 1e-6, "{:?}", size(&s, v));
set(&mut s, v, json!({"height": 40, "path": "M0 0 L20 5"}));
assert_eq!(sizing(&s, v).1, Sizing::Fixed);
assert!((size(&s, v).1 - 40.0).abs() < 1e-6, "{:?}", size(&s, v));
// Rotated, the layer's local size isn't the room layout gives it: a height matching the
// frame's stays fixed rather than have Fill squash the path.
set(&mut s, v, json!({"rotation": 90}));
set(&mut s, v, json!({"path": "M0 0 L20 5", "height": 100}));
assert_eq!(sizing(&s, v).1, Sizing::Fixed);
}
/// What one call's auto layout keys give, whichever way they are spelled: the mode (a string, or
crates/engine/src/assets/components.rs
+4
View File
@@ -147,6 +147,10 @@ pub fn inside_instance(doc: &Document, id: NodeId) -> bool {
/// main layer's, for files from before `modes` was an override group. Copies follow their main
/// layer's modes, so a layer on other modes chose them itself.
pub fn mark_layer_modes(doc: &mut Document) {
// Without an instance nothing can be inside one: skip the per-layer ancestry lookups.
if !doc.nodes().any(|n| matches!(n.kind, NodeKind::Instance { .. })) {
return;
}
let chose: Vec<NodeId> = doc
.nodes()
.filter(|n| !n.overrides.contains("modes") && n.source.and_then(|s| doc.node(s)).is_some_and(|m| m.var_modes != n.var_modes))
crates/engine/src/assets/components/diff.rs
+1
View File
@@ -132,6 +132,7 @@ fn text_style_differs(x: &TextData, y: &TextData) -> bool {
|| x.hanging_list != y.hanging_list
|| x.max_lines != y.max_lines
|| x.features != y.features
|| x.wrap_style != y.wrap_style
}
/// Whether a geometry change of `id` comes from layout rather than the user: an ancestor was
crates/engine/src/assets/components/instances.rs
+1
View File
@@ -160,6 +160,7 @@ pub(crate) fn copy_group(from: &Node, to: &mut Node, g: &str) {
b.hanging_list = a.hanging_list;
b.max_lines = a.max_lines;
b.features = a.features.clone();
b.wrap_style = a.wrap_style;
}
to.styles.text = from.styles.text.clone();
}
crates/engine/src/assets/library_server.rs
+4 -1
View File
@@ -79,10 +79,13 @@ pub fn usage(doc: &Document, library: &str) -> Usage {
let records: std::collections::BTreeMap<NodeId, NodeId> =
doc.libraries.components.iter().filter(|r| r.library == library).map(|r| (r.root, r.key)).collect();
if !records.is_empty() {
// One component's asset root is looked up once, however many instances use it.
let mut roots = std::collections::BTreeMap::<NodeId, Option<NodeId>>::new();
for n in doc.nodes() {
if let NodeKind::Instance { component, .. } = &n.kind
&& store.is_none_or(|st| doc.page_of(n.id) != Some(st))
&& let Some(key) = crate::library::asset_root(doc, *component).and_then(|r| records.get(&r))
&& let Some(key) =
roots.entry(*component).or_insert_with(|| crate::library::asset_root(doc, *component)).and_then(|r| records.get(&r))
{
let c = counts.entry(*key).or_default();
*c = c.saturating_add(1);
crates/engine/src/automation/inspect.rs
+4
View File
@@ -103,6 +103,7 @@ pub const NODE_KEYS: &[&str] = &[
"visible",
"width",
"widthProfile",
"wrapStyle",
"x",
"y",
];
@@ -442,6 +443,9 @@ fn text_props(t: &TextData, o: &mut serde_json::Map<String, Value>, options: &In
if t.leading_trim != figcraft_doc::LeadingTrim::None {
insert_prop(o, options, "leadingTrim", || json!(t.leading_trim));
}
if t.wrap_style != figcraft_doc::WrapStyle::Auto {
insert_prop(o, options, "wrapStyle", || json!(t.wrap_style));
}
if !t.runs.is_empty() {
insert_prop(o, options, "styledRuns", || serde_json::to_value(&t.runs).unwrap_or(Value::Null));
}
crates/engine/src/canvas/textedit.rs
+31 -14
View File
@@ -303,9 +303,21 @@ fn insert_model(s: &mut Session, text: &str, ime_commit: bool) -> Result<ImeInse
Ok(outcome)
}
/// List keys: Tab nests the selected list items a level deeper; Shift+Tab, Backspace at an item's
/// start and Enter on an empty item move it a level out (at the top: out of the list). Returns
/// whether the key was taken.
/// What a list key does to the selected items.
#[derive(Clone, Copy, PartialEq, Eq)]
enum ListMove {
/// A level deeper (Tab).
Deeper,
/// A level out; at the top, out of the list (Shift+Tab, Enter on an empty item).
Out,
/// Out of the list at the level it had: "Use Backspace or Delete at the beginning of a list
/// item to delete the counter, but keep the same level of indentation."
Unlist,
}
/// List keys: Tab nests the selected list items a level deeper; Shift+Tab and Enter on an empty
/// item move it a level out (at the top: out of the list); Backspace and Delete at an item's start
/// take its marker and keep its level. Returns whether the key was taken.
fn list_key(s: &mut Session, key: &str, shift: bool) -> Result<bool> {
let Some(te) = s.ds()?.text_edit.clone() else { return Ok(false) };
let t = text_of(s, te.id)?;
@@ -315,19 +327,24 @@ fn list_key(s: &mut Session, key: &str, shift: bool) -> Result<bool> {
let item = t.para_list(t.para_of(a)).list != ListStyle::None;
let (pa, pb) = t.para_span(a, b);
let any_item = (pa..=pb).any(|p| t.para_list(p).list != ListStyle::None);
let deeper = match key {
"Tab" if any_item => !shift,
"Backspace" if item && at_start => false,
"Enter" if item && at_start && chars.get(a).is_none_or(|c| *c == '\n') => false,
let mv = match key {
"Tab" if any_item && !shift => ListMove::Deeper,
"Tab" if any_item => ListMove::Out,
"Backspace" | "Delete" if item && at_start => ListMove::Unlist,
"Enter" if item && at_start && chars.get(a).is_none_or(|c| *c == '\n') => ListMove::Out,
_ => return Ok(false),
};
edit(s, |t, _| {
t.set_para_lists(a, b, |pl| match pl.list {
ListStyle::None => {}
_ if deeper => pl.indent = pl.indent.saturating_add(1),
_ if pl.indent > 0 => pl.indent -= 1,
_ => pl.list = ListStyle::None,
})
if mv == ListMove::Unlist {
t.unlist_keeping_levels(a, b);
} else {
t.set_para_lists(a, b, |pl| match (pl.list, mv) {
(ListStyle::None, _) | (_, ListMove::Unlist) => {}
(_, ListMove::Deeper) => pl.indent = pl.indent.saturating_add(1),
(_, ListMove::Out) if pl.indent > 0 => pl.indent -= 1,
(_, ListMove::Out) => pl.list = ListStyle::None,
});
}
})?;
Ok(true)
}
@@ -411,7 +428,7 @@ pub fn key(s: &mut Session, key: &str, shift: bool, word: bool, line: bool) -> R
let t = text_of(s, te.id)?;
let chars: Vec<char> = t.characters.chars().collect();
let n = chars.len();
if matches!(key, "Tab" | "Backspace" | "Enter") && !word && !line && list_key(s, key, shift)? {
if matches!(key, "Tab" | "Backspace" | "Delete" | "Enter") && !word && !line && list_key(s, key, shift)? {
return Ok(());
}
match key {
crates/engine/src/canvas/textedit/tests.rs
+1 -1
View File
@@ -242,7 +242,7 @@ fn paragraph_and_feature_commands_on_nodes() {
s.execute("text.listStyle", &json!({"ids": ids, "style": "bulleted"})).unwrap();
let t = data(&s, id);
assert_eq!((t.paragraph_indent, t.paragraph_spacing, t.max_lines), (16.0, 8.0, 2));
assert_eq!(t.auto_resize, TextAutoResize::Truncate);
assert_eq!(t.auto_resize, TextAutoResize::WidthAndHeight, "max lines keep an auto-width text auto width");
assert_eq!(t.style.decoration, TextDecoration::Strikethrough);
assert_eq!(t.style.case, TextCase::SmallCaps);
assert_eq!(t.list, ListStyle::Bulleted);
crates/engine/src/canvas/tools/click.rs
+31
View File
@@ -22,6 +22,29 @@ impl Session {
}
}
/// A double-click on an edge handle of the one selected layer auto layout sizes: Hug contents
/// on that axis for an auto layout frame, Fill container with Alt for a child of one (a
/// vertical edge sizes the width, a horizontal one the height). Whether it applied: on any
/// other layer, or off the edges, the double-click goes on as before.
fn edge_double_click(&mut self, doc: &Document, sel: &[NodeId], ev: &PointerEvent) -> Result<bool> {
let [id] = sel[..] else { return Ok(false) };
let Some(super::Handle::Edge(edge)) = super::handles::handle_at(doc, sel, ev.p(), ev.zoom) else { return Ok(false) };
let Some(n) = doc.node(id) else { return Ok(false) };
let applies = if ev.alt {
!n.child_layout.absolute && n.parent.and_then(|p| doc.node(p)).is_some_and(|p| p.layout.is_some())
} else {
n.layout.is_some()
};
if !applies {
return Ok(false);
}
// Edges run top, right, bottom, left: the odd ones are vertical and size the width.
let mut props = serde_json::Map::new();
props.insert(if edge % 2 == 1 { "sizingH" } else { "sizingV" }.to_string(), json!(if ev.alt { "fill" } else { "hug" }));
self.execute("node.set", &json!({"id": id, "props": props}))?;
Ok(true)
}
pub(super) fn double_click(&mut self, ev: &PointerEvent) -> Result<()> {
let ds = self.ds()?;
let (doc, sel, page) = (ds.doc.clone(), ds.selection.clone(), ds.page);
@@ -61,6 +84,14 @@ impl Session {
self.tool.overlay.marquee = None;
self.cancel_interaction()?;
}
// An edge of an auto layout object's bounding box: Hug contents on that axis, with Alt
// Fill container ("Tip: Double-click the vertical or horizontal edge of an auto layout
// object's bounding box to set it to Hug contents." and "Hold ⌥ Option or Alt and
// double-click the vertical or horizontal edge of an auto layout object's bounding box to
// set it to Fill container.", Guide to auto layout).
if edits && matches!(self.tool.tool, ToolId::Move | ToolId::Scale) && !(ev.shift || ev.cmd) && self.edge_double_click(&doc, &sel, ev)? {
return Ok(());
}
let hit_here = self.hit(&doc, page, ev.p(), ev.tol() * 2.0);
// A double-click anywhere on the one selected shape edits its points, like Enter: also
// inside a hollow (unfilled) closed shape, where the hit test finds nothing under the
crates/engine/src/canvas/vectoredit.rs
+28 -12
View File
@@ -403,7 +403,9 @@ fn visible_handles(net: &VectorNetwork, ve: &VectorEdit) -> Vec<(usize, bool)> {
}
/// Hit test in page coordinates with a tolerance in page units. Visible handles win, then
/// vertices, then segments.
/// vertices, then segments; between a handle and a point both within reach, the nearer one on
/// the page, the handle on a tie (the handles of a short segment end a few pixels from their
/// point, and a click on the point is on the point, #1875).
pub fn hit(doc: &Document, ve: &VectorEdit, p: Point, tol: f64) -> Option<VHit> {
let net = network(doc, ve.id)?;
let w = doc.world_transform(ve.id);
@@ -414,17 +416,31 @@ pub fn hit(doc: &Document, ve: &VectorEdit, p: Point, tol: f64) -> Option<VHit>
if !(lp.x.is_finite() && lp.y.is_finite()) {
return None;
}
for (si, start) in visible_handles(net, ve) {
let (Some(seg), Some(t)) = (net.segments.get(si), net.handle(si, start)) else { continue };
let Some(v) = net.vertices.get(if start { seg.a } else { seg.b }) else { continue };
if (Point::new(v.x + t.0, v.y + t.1) - lp).hypot() <= tl {
return Some(VHit::Handle { seg: si, start });
}
}
let nearest_vertex =
net.vertices.iter().enumerate().map(|(i, v)| (i, (v.point() - lp).hypot())).filter(|(_, d)| *d <= tl).min_by(|a, b| a.1.total_cmp(&b.1));
if let Some((index, _)) = nearest_vertex {
return Some(VHit::Vertex { index });
// Candidates are within the tolerance as before; the nearest is judged on the page, where a
// non-uniform scale doesn't distort it.
let on_page = |q: Point| (w * q - p).hypot();
let nearest_handle = visible_handles(net, ve)
.into_iter()
.filter_map(|(si, start)| {
let (seg, t) = (net.segments.get(si)?, net.handle(si, start)?);
let v = net.vertices.get(if start { seg.a } else { seg.b })?;
let end = Point::new(v.x + t.0, v.y + t.1);
((end - lp).hypot() <= tl).then(|| ((si, start), on_page(end)))
})
.min_by(|a, b| a.1.total_cmp(&b.1));
let nearest_vertex = net
.vertices
.iter()
.enumerate()
.filter(|(_, v)| (v.point() - lp).hypot() <= tl)
.map(|(i, v)| (i, on_page(v.point())))
.min_by(|a, b| a.1.total_cmp(&b.1));
match (nearest_handle, nearest_vertex) {
// A tie (a handle's end on another point) goes to the handle, as handles always won before.
(Some(((seg, start), dh)), Some((_, dv))) if dh <= dv => return Some(VHit::Handle { seg, start }),
(Some(((seg, start), _)), None) => return Some(VHit::Handle { seg, start }),
(_, Some((index, _))) => return Some(VHit::Vertex { index }),
(None, None) => {}
}
use figcraft_geom::kurbo::ParamCurveNearest;
let nearest_seg = (0..net.segments.len())
crates/engine/src/canvas/vectoredit/pointer.rs
+7 -1
View File
@@ -1072,12 +1072,18 @@ impl Session {
}
}
VGesture::BendVertex { v, moved, smooth, .. } => {
let id = ve.id;
if moved {
self.commit_interaction()?;
} else if smooth {
let id = ve.id;
self.preview(|doc, _| edit(doc, id, |net| ops::make_sharp(net, v)))?;
self.commit_interaction()?;
} else if network(self.doc()?, id).is_some_and(|n| n.incident(v).len() == 2) {
// "Click on a point or path where you want to add a curve" (Edit vector
// layers): a sharp point between two segments gets handles along the line
// between its neighbours (#1875); an endpoint has nothing to curve.
self.preview(|doc, _| edit(doc, id, |net| ops::auto_smooth(net, v)))?;
self.commit_interaction()?;
} else {
self.cancel_interaction()?;
}
crates/engine/src/canvas/vectoredit/tests.rs
+127
View File
@@ -119,6 +119,16 @@ fn bend_tool_smooths_and_sharpens_points() {
let n = net(&s, id);
let v = vertex_at(&n, 100.0, 0.0);
assert!(n.incident(v).iter().all(|(s, st)| n.handle(*s, *st) == Some((0.0, 0.0))), "a click sharpens it");
// Clicked again, the sharp corner curves: handles along the line between its neighbours
// (0,0) and (100,100), a third of the way to each (the box refits around the bulge, so the
// point is found by its index).
click(&mut s, 100.0, 0.0);
let n = net(&s, id);
assert_eq!(n.mirroring(v), HandleMirroring::Angle);
for (seg, st) in n.incident(v) {
let h = n.handle(seg, st).unwrap();
assert!((h.0.abs() - 100.0 / 3.0 / 2f64.sqrt()).abs() < 1e-6 && (h.0 - h.1).abs() < 1e-6, "along the neighbours' line: {h:?}");
}
// ⌘-drag on a segment with the Move tool bends it.
ex(&mut s, "vector.edit.tool", json!({"tool": "move"}));
let mut down = ev(PointerKind::Down, 0.0, 50.0);
@@ -130,6 +140,123 @@ fn bend_tool_smooths_and_sharpens_points() {
assert!(b.x0 < -25.0, "bent outwards: {b:?}");
}
/// #1875: a line whose middle point was moved off the line, clicked with the Bend tool, curves
/// there ("Click on a point or path where you want to add a curve", Edit vector layers): the
/// handles run along the line between the neighbours, a third of the way to each, in one undo
/// step; an endpoint is left alone; a click on the curved point makes it sharp again.
#[test]
fn a_bend_click_curves_a_sharp_point_between_its_neighbours() {
let mut s = Session::new();
let r = ex(&mut s, "vector.create", json!({"points": [[0, 0], [50, 30], [100, 0]], "closed": false}));
let id = crate::params::id_of(&r["id"]).unwrap();
ex(&mut s, "vector.edit.begin", json!({"id": id}));
ex(&mut s, "vector.edit.tool", json!({"tool": "bend"}));
let (v, end) = (vertex_at(&net(&s, id), 50.0, 30.0), vertex_at(&net(&s, id), 0.0, 0.0));
let before = s.undo_depth().0;
click(&mut s, 50.0, 30.0);
let n = net(&s, id);
let reach = (50f64.powi(2) + 30f64.powi(2)).sqrt() / 3.0;
for (seg, st) in n.incident(v) {
let h = n.handle(seg, st).unwrap();
assert!((h.0.abs() - reach).abs() < 1e-6 && h.1.abs() < 1e-6, "along the neighbours' line, a third of the way: {h:?}");
}
assert_eq!(n.mirroring(v), HandleMirroring::Angle);
assert_eq!(s.undo_depth().0, before + 1, "one undo step");
// An endpoint has nothing to curve: the click changes nothing and leaves no undo step.
click(&mut s, 0.0, 0.0);
let n = net(&s, id);
assert!(n.incident(end).iter().all(|(sg, st)| n.handle(*sg, *st) == Some((0.0, 0.0))));
assert_eq!(s.undo_depth().0, before + 1);
// The curved point clicked again is sharp again.
click(&mut s, 50.0, 30.0);
let n = net(&s, id);
assert!(n.incident(v).iter().all(|(sg, st)| n.handle(*sg, *st) == Some((0.0, 0.0))));
}
/// Between a handle's end and a point both within reach, the nearer on the page wins, also under a
/// non-uniform scale (10× wide here), where local distances would pick the point.
#[test]
fn a_handle_and_a_point_are_compared_on_the_page() {
let mut s = Session::new();
let r = ex(&mut s, "vector.create", json!({"points": [[0, 0], [5, 0]], "closed": false}));
let id = crate::params::id_of(&r["id"]).unwrap();
{
let node = s.doc_mut().unwrap().get_mut(id).unwrap();
let mut n = VectorNetwork::default();
n.vertices.push(figcraft_doc::Vertex::new(0.0, 0.0));
n.vertices.push(figcraft_doc::Vertex::new(5.0, 0.0));
let mut seg = figcraft_doc::Segment::line(0, 1);
seg.ta = (0.5, -0.9);
n.segments.push(seg);
node.kind = figcraft_doc::NodeKind::Vector { network: n };
node.transform = figcraft_geom::Affine::scale_non_uniform(10.0, 1.0);
}
ex(&mut s, "vector.edit.begin", json!({"id": id}));
ex(&mut s, "vector.edit.select", json!({"vertices": [0]}));
let doc = s.doc().unwrap().clone();
// On the page the point is at (0, 0) and its handle's end at (5, -0.9): from (4, 0) the
// handle's end is 1.3 away and the point 4, though locally the point is the nearer.
assert_eq!(hit(&doc, &ve(&s), pt(4.0, 0.0), 6.0), Some(VHit::Handle { seg: 0, start: true }));
assert_eq!(hit(&doc, &ve(&s), pt(0.0, 0.0), 6.0), Some(VHit::Vertex { index: 0 }));
}
/// A handle whose end lies exactly on another point (snapped there) can still be taken there: on a
/// tie the handle wins, as handles always did.
#[test]
fn a_handle_on_another_point_is_still_the_handles() {
let mut s = Session::new();
let r = ex(&mut s, "vector.create", json!({"points": [[0, 0], [10, 0]], "closed": false}));
let id = crate::params::id_of(&r["id"]).unwrap();
{
let node = s.doc_mut().unwrap().get_mut(id).unwrap();
let mut n = VectorNetwork::default();
n.vertices.push(figcraft_doc::Vertex::new(0.0, 0.0));
n.vertices.push(figcraft_doc::Vertex::new(10.0, 0.0));
let mut seg = figcraft_doc::Segment::line(0, 1);
seg.ta = (10.0, 0.0);
n.segments.push(seg);
node.kind = figcraft_doc::NodeKind::Vector { network: n };
node.transform = figcraft_geom::Affine::IDENTITY;
}
ex(&mut s, "vector.edit.begin", json!({"id": id}));
ex(&mut s, "vector.edit.select", json!({"vertices": [0]}));
let doc = s.doc().unwrap().clone();
// Where the points are on the page now (entering edit mode may refit the layer's box).
let n = net(&s, id);
let w = doc.world_transform(id);
let (p0, p1) = (w * n.vertices[0].point(), w * n.vertices[1].point());
// Point 0's handle ends on point 1: there the handle; on point 0, the point.
assert_eq!(hit(&doc, &ve(&s), p1, 6.0), Some(VHit::Handle { seg: 0, start: true }));
assert_eq!(hit(&doc, &ve(&s), p0, 6.0), Some(VHit::Vertex { index: 0 }));
}
/// A short path's handles end a few pixels from their point: a click on the point is still on the
/// point (the nearer of the two wins), so the Bend tool can sharpen it again, while a click on the
/// handle's end still takes the handle.
#[test]
fn short_handles_leave_their_point_clickable() {
let mut s = Session::new();
let r = ex(&mut s, "vector.create", json!({"points": [[0, 0], [6, 10], [12, 0]], "closed": false}));
let id = crate::params::id_of(&r["id"]).unwrap();
ex(&mut s, "vector.edit.begin", json!({"id": id}));
ex(&mut s, "vector.edit.tool", json!({"tool": "bend"}));
let v = vertex_at(&net(&s, id), 6.0, 10.0);
click(&mut s, 6.0, 10.0);
let n = net(&s, id);
let curved = |n: &VectorNetwork| n.incident(v).iter().all(|(sg, st)| n.handle(*sg, *st).is_some_and(|h| h != (0.0, 0.0)));
assert!(curved(&n));
let reach = (6f64.powi(2) + 10f64.powi(2)).sqrt() / 3.0;
assert!(reach < 6.0, "the handles end within the 6 px hit tolerance: {reach}");
// A click on the handle's end takes the handle (nothing changes); one on the point sharpens it.
let (sg, st) = n.incident(v)[0];
let h = n.handle(sg, st).unwrap();
click(&mut s, 6.0 + h.0, 10.0 + h.1);
assert!(curved(&net(&s, id)), "the handle's end is the handle's");
click(&mut s, 6.0, 10.0);
let n = net(&s, id);
assert!(n.incident(v).iter().all(|(sg, st)| n.handle(*sg, *st) == Some((0.0, 0.0))), "the point is the point's: sharp again");
}
#[test]
fn paint_bucket_fills_and_unfills_areas() {
let mut s = Session::new();
crates/engine/src/cmd/arrange.rs
+7 -6
View File
@@ -569,12 +569,6 @@ pub(crate) fn resize_cmd(s: &mut Session, p: &Value) -> Result<Value> {
let n = doc.get_mut(i)?;
let after = n.transform * Point::new(w * ax, h * ay);
n.transform = Affine::translate(before - after) * n.transform;
if num(p, "width").is_some() {
n.child_layout.sizing_h = Sizing::Fixed;
}
if num(p, "height").is_some() {
n.child_layout.sizing_v = Sizing::Fixed;
}
if let NodeKind::Text(t) = &mut n.kind {
if num(p, "height").is_some() {
t.fix_size(num(p, "width").is_some(), true);
@@ -582,6 +576,13 @@ pub(crate) fn resize_cmd(s: &mut Session, p: &Value) -> Result<Value> {
t.auto_resize = TextAutoResize::Height;
}
}
// A side given is fixed, or fills its auto layout parent when it is the full space there.
if num(p, "width").is_some() {
super::props::fix_axis(doc, i, true)?;
}
if num(p, "height").is_some() {
super::props::fix_axis(doc, i, false)?;
}
super::props::restore_worlds(doc, &kept)?;
}
super::styles::detach_edited(doc, &before);
crates/engine/src/cmd/layout.rs
+3 -2
View File
@@ -42,8 +42,8 @@ fn set_track(s: &mut Session, p: &Value) -> Result<Value> {
return Err(bad(CMD, format!("node {id} is not a grid auto layout frame")));
};
let count = tracks_now.len().max(if columns { l.grid_columns } else { l.grid_rows } as usize).min(MAX_TRACKS);
if !(0.0..count as f64).contains(&index) {
return Err(bad(CMD, format!("`index` must be 0..{count}")));
if index.fract() != 0.0 || !(0.0..count as f64).contains(&index) {
return Err(bad(CMD, format!("`index` must be an integer in 0..{count}")));
}
let i = index as usize;
let track = match kind {
@@ -256,6 +256,7 @@ mod tests {
json!({"ids": [f], "axis": "diagonal", "index": 0, "sizing": "fixed"}),
json!({"ids": [f], "axis": "columns", "index": 9, "sizing": "fixed"}),
json!({"ids": [f], "axis": "columns", "index": -1, "sizing": "hug"}),
json!({"ids": [f], "axis": "columns", "index": 1.5, "sizing": "fixed", "value": 50}),
json!({"ids": [f], "axis": "columns", "index": 0, "sizing": "stretchy"}),
json!({"ids": [kids[1]], "axis": "columns", "index": 0, "sizing": "hug"}),
] {
crates/engine/src/cmd/props.rs
+66 -10
View File
@@ -437,17 +437,55 @@ fn layout_keys_beside_none(cmd: &str, props: &Map<String, Value>) -> Result<()>
}
/// An explicit width (`is_w`) or height makes hugging or filling on that axis fixed, like typing
/// into W or H.
fn fix_axis(doc: &mut Document, id: NodeId, is_w: bool) -> Result<()> {
/// into W or H; sized to the full space its auto layout parent has for it on that axis, the layer
/// fills instead: "Child objects of an auto layout frame will also be set to Fill container if
/// they are manually resized to the full available space of the parent frame" (Guide to auto
/// layout).
pub(crate) fn fix_axis(doc: &mut Document, id: NodeId, is_w: bool) -> Result<()> {
let sizing = if fills_available_space(doc, id, is_w) { Sizing::Fill } else { Sizing::Fixed };
let n = doc.get_mut(id)?;
if is_w {
n.child_layout.sizing_h = Sizing::Fixed;
n.child_layout.sizing_h = sizing;
} else {
n.child_layout.sizing_v = Sizing::Fixed;
n.child_layout.sizing_v = sizing;
}
Ok(())
}
/// Whether `id`'s width (`is_w`) or height is the full space its auto layout parent has for it on
/// that axis: the frame's size less its padding and an inside stroke included in the layout (the
/// insets layout itself takes). Across the flow that is every child's room;
/// along the flow only a lone child has it (beside siblings what is left depends on the gaps, the
/// alignment and overflow, so a size that happens to match it is not "the full available
/// space"). Never in a hugging or wrapping frame or a grid, or for a layer that ignores the layout.
fn fills_available_space(doc: &Document, id: NodeId, is_w: bool) -> bool {
let Some(n) = doc.node(id) else { return false };
let Some(parent) = n.parent.and_then(|p| doc.node(p)) else { return false };
let Some(l) = &parent.layout else { return false };
if n.child_layout.absolute || l.wrap || l.mode == LayoutMode::Grid {
return false;
}
// A rotated layer's local size isn't the size layout gives it room for (its rotated bounds
// are): it stays Fixed rather than have Fill squash its geometry.
let [_, b, c, ..] = n.transform.as_coeffs();
if b.abs() > 1e-9 || c.abs() > 1e-9 {
return false;
}
let hugs = if is_w { parent.child_layout.sizing_h } else { parent.child_layout.sizing_v } == Sizing::Hug;
if hugs {
return false;
}
if (l.mode == LayoutMode::Horizontal) == is_w
&& parent.children.iter().filter(|c| **c != id).filter_map(|c| doc.node(*c)).any(|c| c.visible && !c.child_layout.absolute)
{
return false;
}
let (pt, pr, pb, pl) = figcraft_layout::insets(parent, l);
let available = if is_w { parent.width - pl - pr } else { parent.height - pt - pb };
let size = if is_w { n.width } else { n.height };
available > 0.0 && (size - available).abs() < 0.01
}
/// The `geometry` properties of `apply`; `false` when `k` is not one of them.
fn apply_geometry(
cmd: &str,
@@ -459,10 +497,17 @@ fn apply_geometry(
path_offset: &mut (f64, f64),
) -> Result<bool> {
match k {
"path" => *path_offset = set_path(cmd, doc, id, v, props)?,
// A new path takes the size asked for as its scale (`set_path`); the size still fixes
// its auto layout axis.
"width" | "height" | "w" | "h" if props.contains_key("path") => fix_axis(doc, id, k.starts_with('w'))?,
"path" => {
*path_offset = set_path(cmd, doc, id, v, props)?;
// A size given beside the path is its scale (`set_path`), and still fixes or fills
// its auto layout axis, judged once the path has given the layer that size.
for (long, short, is_w) in [("width", "w", true), ("height", "h", false)] {
if props.contains_key(long) || props.contains_key(short) {
fix_axis(doc, id, is_w)?;
}
}
}
"width" | "height" | "w" | "h" if props.contains_key("path") => {}
"x" | "y" => {
let val = f64_of(v).ok_or_else(|| bad(cmd, format!("`{k}` must be a number")))?;
let val = val + if k == "x" { path_offset.0 } else { path_offset.1 };
@@ -578,7 +623,15 @@ fn apply_look(cmd: &str, doc: &mut Document, id: NodeId, k: &str, v: &Value) ->
doc.get_mut(id)?.stroke.miter_limit = StrokeProps::miter_limit_for(deg);
}
"dashes" => {
let d: Vec<f64> = v.as_array().map(|a| a.iter().filter_map(f64_of).map(|x| x.max(0.0)).collect()).unwrap_or_default();
let d: Vec<f64> = if v.is_null() {
Vec::new()
} else {
let a = v.as_array().ok_or_else(|| bad(cmd, "`dashes` must be an array of numbers"))?;
a.iter()
.map(|x| if x.is_boolean() { None } else { f64_of(x).map(|n| n.max(0.0)) })
.collect::<Option<_>>()
.ok_or_else(|| bad(cmd, "`dashes` must be an array of numbers"))?
};
doc.get_mut(id)?.stroke.dashes = d;
}
"dashCap" => {
@@ -908,6 +961,9 @@ fn apply_text(cmd: &str, doc: &mut Document, id: NodeId, props: &Map<String, Val
*if k == "hangingList" { &mut t.hanging_list } else { &mut t.hanging_punctuation } = on;
}
"leadingTrim" => text_mut(cmd, doc.get_mut(id)?)?.leading_trim = enum_of(v).ok_or_else(|| bad(cmd, "leadingTrim: none|capHeight"))?,
"wrapStyle" | "textWrap" => {
text_mut(cmd, doc.get_mut(id)?)?.wrap_style = enum_of(v).ok_or_else(|| bad(cmd, "wrapStyle: auto|balance|pretty"))?
}
"maxLines" => {
let lines = f64_of(v).unwrap_or(0.0).clamp(0.0, 10_000.0) as u32;
let n = doc.get_mut(id)?;
@@ -1152,7 +1208,7 @@ pub fn override_group(k: &str) -> &'static str {
"name" => "name",
"characters" | "text" => "characters",
"features" | "fontFeatures" | "openTypeFeatures" | "listStyle" | "indentation" | "listSpacing" | "maxLines" | "variationSettings"
| "hangingPunctuation" | "hangingList" => "textStyle",
| "hangingPunctuation" | "hangingList" | "wrapStyle" | "textWrap" => "textStyle",
"cornerRadius" | "cornerSmoothing" | "topLeftRadius" | "topRightRadius" | "bottomRightRadius" | "bottomLeftRadius" => "corners",
"width" | "height" | "w" | "h" => "size",
"sizingH" | "sizingV" | "layoutSizingHorizontal" | "layoutSizingVertical" | "minWidth" | "maxWidth" | "minHeight" | "maxHeight" => "resizing",
crates/engine/src/cmd/proto.rs
+18 -4
View File
@@ -31,8 +31,8 @@ pub fn specs() -> Vec<CommandSpec> {
spec!("proto.interaction.remove", "Remove interaction", "{id?, index}", true, |s, p| {
let cmd = "proto.interaction.remove";
let k = req_num(cmd, p, "index")?;
if k < 0.0 {
return Err(bad(cmd, "`index` must be ≥ 0"));
if !(0.0..1e9).contains(&k) || k.fract() != 0.0 {
return Err(bad(cmd, "`index` must be a whole number in 0..1e9"));
}
let k = k as usize;
let mut hit = false;
@@ -406,8 +406,8 @@ fn set(s: &mut Session, p: &Value) -> Result<Value> {
let cmd = "proto.interaction.set";
let p = &super::proto_actions::with_expressions(cmd, &s.doc()?.variables, p)?;
let k = req_num(cmd, p, "index")?;
if k < 0.0 {
return Err(bad(cmd, "`index` must be ≥ 0"));
if !(0.0..1e9).contains(&k) || k.fract() != 0.0 {
return Err(bad(cmd, "`index` must be a whole number in 0..1e9"));
}
let k = k as usize;
let whole: Option<Interaction> = parse(cmd, p, "interaction")?;
@@ -536,6 +536,20 @@ mod tests {
assert_eq!(s.doc().unwrap().node(a).unwrap().interactions.len(), 2);
}
#[test]
fn fractional_index_is_rejected() {
let mut s = Session::new();
let a = frame(&mut s, 0.0);
let b = frame(&mut s, 200.0);
s.execute("proto.interaction.add", &json!({"id": a, "dest": b})).unwrap();
s.execute("proto.interaction.add", &json!({"id": a, "dest": b})).unwrap();
assert!(s.execute("proto.interaction.remove", &json!({"id": a, "index": 0.5})).is_err());
assert_eq!(s.doc().unwrap().node(a).unwrap().interactions.len(), 2);
let before = s.doc().unwrap().node(a).unwrap().interactions[0].clone();
assert!(s.execute("proto.interaction.set", &json!({"id": a, "index": 0.5, "easing": "linear"})).is_err());
assert_eq!(s.doc().unwrap().node(a).unwrap().interactions[0], before);
}
#[test]
fn flows_add_rename_remove() {
let mut s = Session::new();
crates/engine/src/cmd/text.rs
+39 -2
View File
@@ -308,6 +308,17 @@ pub fn specs() -> Vec<CommandSpec> {
set_list(s, p, l, false)
}
),
spec!(
"text.wrapStyle",
"Wrap style",
"{style: auto|balance|pretty, ids?} where lines break when the text wraps: Auto fits as many words as fit on each line, Balance makes the lines close to the same length, Pretty keeps lines full but leaves no one word alone on the last",
true,
|s, p| {
let w: figcraft_doc::WrapStyle =
get(p, "style").and_then(super::props::enum_of).ok_or_else(|| bad("text.wrapStyle", "`style`: auto|balance|pretty"))?;
para(s, p, |t| t.wrap_style = w)
}
),
spec!("text.paragraphIndent", "Paragraph indent", "{indent (px), ids?}", true, |s, p| {
let v = finite(req_num("text.paragraphIndent", p, "indent")?).clamp(0.0, 10_000.0);
para(s, p, |t| t.paragraph_indent = v)
@@ -319,13 +330,13 @@ pub fn specs() -> Vec<CommandSpec> {
spec!(
"text.maxLines",
"Max lines",
"{lines (0 = no limit; truncates: auto-height text hugs up to that many lines, other text becomes a truncating box), ids?}",
"{lines (0 = no limit; truncates: auto-height and auto-width text hug up to that many lines, fixed-size text becomes a truncating box), ids?}",
true,
|s, p| {
let v = finite(req_num("text.maxLines", p, "lines")?).clamp(0.0, 10_000.0) as u32;
let r = para(s, p, |t| {
t.max_lines = v;
if v > 0 && t.auto_resize != TextAutoResize::Height {
if v > 0 && !matches!(t.auto_resize, TextAutoResize::Height | TextAutoResize::WidthAndHeight) {
t.auto_resize = TextAutoResize::Truncate;
}
})?;
@@ -521,6 +532,32 @@ pub fn specs() -> Vec<CommandSpec> {
textedit::end(s)?;
ok()
}),
spec!(
"text.openLink",
"Open link",
"{} while editing: the link at the caret (the selection's start) goes to the UI to open, as Alt+Enter does (\"press Option Return / Alt Enter to activate a focused link\"); only a web or mail link opens → {url} ({url: null}: no link there)",
false,
|s, _| {
let Some(te) = s.ds()?.text_edit.clone() else { return Err(bad("text.openLink", "no text is being edited")) };
let doc = s.doc()?;
let t = doc.node(te.id).and_then(|n| n.kind.text()).ok_or_else(|| bad("text.openLink", format!("{} is not text", te.id)))?;
let n = t.char_count();
let at = te.caret.min(te.anchor);
// The caret sits between two chars: the link of the one after it, else before it.
let link = (at < n)
.then(|| t.style_at(at).link.clone())
.flatten()
.or_else(|| (at > 0 && at <= n).then(|| t.style_at(at - 1).link.clone()).flatten());
match link {
Some(url) if crate::doc_urls::openable(&url) => {
s.request_ui("open.url", json!({"url": url}));
Ok(json!({"url": url}))
}
Some(url) => Err(bad("text.openLink", format!("`{url}` is not a web or mail link"))),
None => Ok(json!({"url": Value::Null})),
}
}
),
spec!(
"text.fonts",
"List fonts",
crates/engine/src/cmd/view.rs
+7
View File
@@ -321,6 +321,13 @@ pub fn specs() -> Vec<CommandSpec> {
spec!("view.snapObjects", "Snap to objects", "{on?}", false, |s, p| toggle(s, p, "view.snapObjects")),
spec!("view.snapPixel", "Snap to pixel grid", "{on?}", false, |s, p| toggle(s, p, "view.snapPixel")),
spec!("view.toggleUi", "Show/Hide UI", "{on?}", false, |s, p| flag(s, p, |v| &mut v.ui_hidden)),
spec!(
"view.minimize",
"Minimize the interface",
"{on?} collapses the navigation bar and both sidebars and keeps the toolbar (Shift+Cmd/Ctrl+\\, the Minimize button by the file name); the right sidebar shows while something is selected",
false,
|s, p| flag(s, p, |v| &mut v.ui_minimized)
),
spec!("view.fullscreen", "Full screen", "{on?} the window fills the screen (the desktop app; a no-op headless)", false, |s, p| {
s.request_ui("window.fullscreen", json!({"on": boolean(p, "on")}));
ok()
crates/engine/src/components_behaviour_tests.rs
+9
View File
@@ -338,6 +338,15 @@ fn overridable_properties_stay_through_main_edits_and_reset() {
|n| text(n).paragraph_spacing.to_string(),
"a text property like the others",
),
(
"wrap style",
Layer::Title,
"textStyle",
json!({"wrapStyle": "balance"}),
Some(json!({"wrapStyle": "pretty"})),
|n| format!("{:?}", text(n).wrap_style),
"a text property like the others (#1827)",
),
(
"padding",
Layer::Row,
crates/engine/src/dash_cap_tests.rs
+15
View File
@@ -69,3 +69,18 @@ fn inspect_shows_it_and_copied_properties_carry_it() {
s.execute("edit.pasteProperties", &json!({"ids": [b]})).unwrap();
assert_eq!(cap(&s, b), None);
}
#[test]
fn node_set_rejects_bad_dashes_and_keeps_the_stroke() {
let mut s = Session::new();
let l = line(&mut s);
let dashes = |s: &Session| s.doc().unwrap().node(l).unwrap().stroke.dashes.clone();
for bad in [json!([5, "x", 20]), json!([5, true, 20]), json!([5, false, 20]), json!("abc"), json!(5)] {
assert!(s.execute("node.set", &json!({"id": l, "props": {"dashes": bad}})).is_err());
assert_eq!(dashes(&s), vec![20.0, 20.0], "a rejected value changes nothing");
}
s.execute("node.set", &json!({"id": l, "props": {"dashes": [5, 20]}})).unwrap();
assert_eq!(dashes(&s), vec![5.0, 20.0]);
s.execute("node.set", &json!({"id": l, "props": {"dashes": null}})).unwrap();
assert!(dashes(&s).is_empty());
}
crates/engine/src/dev/codegen/css.rs
+5
View File
@@ -302,6 +302,11 @@ fn text_decls(doc: &Document, n: &Node, tx: &figcraft_doc::TextData, t: &mut Tok
TextAlignH::Right => put("text-align", "right".into()),
TextAlignH::Justified => put("text-align", "justify".into()),
}
match tx.wrap_style {
figcraft_doc::WrapStyle::Auto => {}
figcraft_doc::WrapStyle::Balance => put("text-wrap", "balance".into()),
figcraft_doc::WrapStyle::Pretty => put("text-wrap", "pretty".into()),
}
match s.case {
TextCase::Original => {}
TextCase::Upper => put("text-transform", "uppercase".into()),
crates/engine/src/dev/tailwind.rs
+2
View File
@@ -310,6 +310,8 @@ fn decl(key: &str, value: &str) -> Vec<(String, String)> {
("text-transform", "uppercase") => kw("uppercase"),
("text-transform", "lowercase") => kw("lowercase"),
("text-transform", "capitalize") => kw("capitalize"),
("text-wrap", "balance") => kw("text-balance"),
("text-wrap", "pretty") => kw("text-pretty"),
("text-decoration", "underline") => kw("underline"),
("text-decoration", "line-through") => kw("line-through"),
_ => one(format!("[{key}:{}]", arb(value).trim_matches(['[', ']']))),
crates/engine/src/double_click_tests.rs
+74
View File
@@ -128,3 +128,77 @@ fn a_press_drags_only_past_the_threshold_in_screen_pixels() {
assert_eq!(origin(&s, r).2 != 200.0, resizes, "resize by {by}");
}
}
/// A double-click with Alt held throughout, as the canvas sends it.
fn alt_double_click(s: &mut Session, x: f64, y: f64, zoom: f64) {
for kind in [PointerKind::Down, PointerKind::Up, PointerKind::Down, PointerKind::DoubleClick] {
let mut ev = PointerEvent::at(kind, x, y, zoom);
ev.alt = true;
s.pointer(&ev).unwrap();
}
}
/// "Tip: Double-click the vertical or horizontal edge of an auto layout object's bounding box to
/// set it to Hug contents." and "Hold ⌥ Option or Alt and double-click the vertical or horizontal
/// edge of an auto layout object's bounding box to set it to Fill container." (Guide to auto
/// layout): a vertical edge sizes the width, a horizontal one the height; a layer auto layout
/// doesn't size keeps the double-click's old meaning.
#[test]
fn a_double_click_on_an_auto_layout_edge_hugs_and_with_alt_fills() {
use figcraft_doc::Sizing;
let mut s = Session::new();
let f = id_of(&ex(&mut s, "frame.create", json!({"x": 0, "y": 0, "width": 400, "height": 100}))["id"]).unwrap();
ex(&mut s, "node.set", json!({"id": f, "props": {"layout": "horizontal", "padding": 0, "gap": 0}}));
let c =
id_of(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 0, "width": 100, "height": 40, "parent": f, "props": {"fill": "#FF0000"}}))["id"])
.unwrap();
let sizing = |s: &Session, id: NodeId| {
let cl = &s.doc().unwrap().node(id).unwrap().child_layout;
(cl.sizing_h, cl.sizing_v)
};
let size = |s: &Session, id: NodeId| {
let n = s.doc().unwrap().node(id).unwrap();
(n.width, n.height)
};
ex(&mut s, "select.set", json!({"ids": [f]}));
assert_eq!((sizing(&s, f), size(&s, f)), ((Sizing::Fixed, Sizing::Fixed), (400.0, 100.0)));
// The frame's right edge: Hug contents horizontally, and the frame shrinks onto its child.
double_click(&mut s, 400.0, 50.0, 0.0, 1.0);
assert_eq!(sizing(&s, f), (Sizing::Hug, Sizing::Fixed));
assert_eq!(size(&s, f), (100.0, 100.0));
assert_eq!(s.selection(), [f], "still selected, not entered");
s.undo().unwrap();
assert_eq!((sizing(&s, f), size(&s, f)), ((Sizing::Fixed, Sizing::Fixed), (400.0, 100.0)), "one undo step");
// Its bottom edge: Hug contents vertically.
double_click(&mut s, 200.0, 100.0, 0.0, 1.0);
assert_eq!(sizing(&s, f), (Sizing::Fixed, Sizing::Hug));
assert_eq!(size(&s, f), (400.0, 40.0));
// Alt on the child's right edge: Fill container horizontally, and the child takes the width.
ex(&mut s, "select.set", json!({"ids": [c]}));
alt_double_click(&mut s, 100.0, 20.0, 1.0);
assert_eq!(sizing(&s, c), (Sizing::Fill, Sizing::Fixed));
assert_eq!(size(&s, c), (400.0, 40.0));
// Without Alt the child, no auto layout frame itself, keeps the old meaning (a frame's
// double-click: nothing to enter here), and a plain rectangle's edge still edits its points.
double_click(&mut s, 400.0, 20.0, 0.0, 1.0);
assert_eq!(sizing(&s, c), (Sizing::Fill, Sizing::Fixed));
// A text child of the frame: Alt+double-click on its edge sets Fill like any child's, and a
// plain double-click on its edge still enters the text.
let x = id_of(&ex(&mut s, "text.create", json!({"text": "Hi", "x": 0, "y": 0, "parent": f, "props": {"fontSize": 16}}))["id"]).unwrap();
ex(&mut s, "node.set", json!({"id": x, "props": {"textAutoResize": "none", "width": 60, "height": 20}}));
ex(&mut s, "select.set", json!({"ids": [x]}));
let b = s.doc().unwrap().world_bounds(x).unwrap();
alt_double_click(&mut s, b.x1, (b.y0 + b.y1) / 2.0, 1.0);
assert_eq!(sizing(&s, x), (Sizing::Fill, Sizing::Fixed), "a text child fills too");
let b = s.doc().unwrap().world_bounds(x).unwrap();
// On the edge handle, a pixel in (the hit test's reach): the text, not the frame edge it shares.
double_click(&mut s, b.x1 - 1.0, (b.y0 + b.y1) / 2.0, 0.0, 1.0);
assert!(s.ds().unwrap().text_edit.as_ref().is_some_and(|te| te.id == x), "a text's edge still enters it without Alt");
assert_eq!(sizing(&s, x), (Sizing::Fill, Sizing::Fixed));
crate::textedit::end(&mut s).unwrap();
let r = id_of(&ex(&mut s, "shape.rectangle", json!({"x": 0, "y": 300, "width": 100, "height": 100}))["id"]).unwrap();
ex(&mut s, "select.set", json!({"ids": [r]}));
double_click(&mut s, 99.0, 350.0, 0.0, 1.0);
assert_eq!(sizing(&s, r), (Sizing::Fixed, Sizing::Fixed));
assert!(s.ds().unwrap().vector_edit.is_some(), "a shape's double-click still edits its points");
}
crates/engine/src/extensions/widgets.rs
+1 -3
View File
@@ -243,9 +243,7 @@ fn build(s: &mut Session, plugin: &str, w: NodeId, r: &WidgetRender) -> Result<(
if !is_widget(n) || n.plugin_data.get(PLUGIN).map(String::as_str) != Some(plugin) {
return Err(bad(cmd, "the layer is no longer this plugin's widget"));
}
for c in n.children.clone() {
doc.remove(c)?;
}
doc.remove_children(w)?;
crate::cmd::props::apply(cmd, doc, w, &props(&r.root, true))?;
let n = doc.get_mut(w)?;
n.locked = false;
crates/engine/src/keymap.rs
+4 -1
View File
@@ -225,7 +225,7 @@ pub static KEYS: &[Binding] = &[
k(View, "view.prototype", &["Alt+9"]).label("Prototype panel"),
k(View, "view.designPrototype", &["Shift+E"]),
k(View, "view.devMode", &["Shift+D"]).label("Dev Mode on/off"),
k(View, "view.leftSidebar", &["Shift+Cmd+\\"]),
k(View, "view.minimize", &["Shift+Cmd+\\"]),
k(View, "view.nextRegion", &["F6"]).win(&["F6", "Ctrl+F6"]).label("Focus the next region (toolbar, layers, canvas, properties)").both(),
k(View, "view.previousRegion", &["Shift+F6"]).label("Focus the previous region").both(),
k(View, "view.contextMenu", &["Shift+F10", "Menu"]).label("Context menu of the selection (the focused layer row or the canvas)"),
@@ -247,6 +247,7 @@ pub static KEYS: &[Binding] = &[
// Text (on selected text layers, and on the selected characters while editing)
k(Text, "text.bold", &["Cmd+B"]).both(),
k(Text, "text.italic", &["Cmd+I"]).both(),
k(Text, "text.openLink", &["Alt+Enter"]).both(),
k(Text, "text.underline", &["Cmd+U"]).both(),
k(Text, "text.strikethrough", &["Shift+Cmd+X"]).both(),
k(Text, "text.link", &["Shift+Cmd+U", "Cmd+K"]).text(),
@@ -364,6 +365,8 @@ pub static GESTURES: &[(Group, &str, &str, &str)] = &[
(Transform, "Opacity 10%…90%, 0: 100%", "1…9, 0", "1…9, 0"),
(Transform, "Exact opacity (4 then 5: 45%)", "Two digits", "Two digits"),
(Transform, "Suspend snapping while dragging", "Hold ⌃ or ⌘", "Hold Ctrl"),
(Arrange, "Set hug contents", "Double-click an edge of an auto layout frame", "Double-click an edge of an auto layout frame"),
(Arrange, "Set fill container", "⌥ double-click an edge of an auto layout child", "Alt+double-click an edge of an auto layout child"),
(Prototype, "Presenting: next frame", "→, Space or N", "→, Space or N"),
(Prototype, "Presenting: previous frame", "←", "←"),
(Prototype, "Presenting: restart", "R", "R"),
crates/engine/src/lib.rs
+2
View File
@@ -565,6 +565,8 @@ mod text_behaviour_tests;
#[cfg(test)]
mod text_fill_tests;
#[cfg(test)]
mod text_link_tests;
#[cfg(test)]
mod text_metrics_local_tests;
#[cfg(test)]
mod text_motion_tests;
crates/engine/src/shortcut_parity_tests.rs
+3 -2
View File
@@ -145,7 +145,7 @@ static ROWS: &[Row] = &[
doc(View, "Outline mode", &["Shift+Cmd+O"], &[], Bound("view.outlines"), ""),
doc(View, "Pixel preview", &["Ctrl+P"], &["Ctrl+Alt+P"], Bound("view.pixelPreview"), ""),
doc(View, "Others' cursors in a live session", &["Alt+Cmd+\\"], &["Ctrl+Alt+\\"], Bound("view.multiplayerCursors"), "new command"),
doc(View, "Hide the side panels (minimize the interface)", &["Shift+Cmd+\\"], &[], Bound("view.leftSidebar"), ""),
doc(View, "Minimize the interface: the navigation bar and both sidebars", &["Shift+Cmd+\\"], &[], Bound("view.minimize"), "the toolbar stays; the right sidebar shows while something is selected"),
doc(View, "Layers panel", &["Alt+1"], &["Alt+1", "Ctrl+1"], Bound("view.layers"), "one article writes Ctrl+1 for Windows, another Alt+1; both bound there"),
doc(View, "Interface scale: make larger", &["Alt+Shift+Cmd+="], &[], Bound("pref.uiScaleUp"), "Accessibility at Figma, Adjust the scale of the Figma UI"),
doc(View, "Interface scale: make smaller", &["Alt+Shift+Cmd+-"], &[], Bound("pref.uiScaleDown"), "Accessibility at Figma"),
@@ -181,6 +181,7 @@ static ROWS: &[Row] = &[
pin(Zoom, "view.nextFrame", &["N", "End"], &[]),
// Text
doc(Text, "Bold", &["Cmd+B"], &[], Bound("text.bold"), ""),
doc(Text, "Activate a focused link", &["Alt+Enter"], &[], Bound("text.openLink"), "while editing: the link at the caret; web and mail links only"),
doc(Text, "Italic", &["Cmd+I"], &[], Bound("text.italic"), ""),
doc(Text, "Underline", &["Cmd+U"], &[], Bound("text.underline"), ""),
doc(Text, "Strikethrough", &["Shift+Cmd+X"], &[], Bound("text.strikethrough"), ""),
@@ -412,7 +413,7 @@ fn counts_match_the_docs() {
let reserved = documented.iter().filter(|r| !r.reserved.is_empty()).count();
let pinned = ROWS.len() - documented.len();
// docs/ui-parity.md quotes these.
assert_eq!((documented.len(), bound, moved, missing, reserved, pinned), (133, 132, 1, 0, 2, 57));
assert_eq!((documented.len(), bound, moved, missing, reserved, pinned), (134, 133, 1, 0, 2, 57));
}
#[test]
crates/engine/src/text_behaviour_tests.rs
+135 -1
View File
@@ -365,12 +365,146 @@ fn max_lines_on_auto_height_text_hugs_that_many_lines() {
s.execute("node.set", &json!({"id": t, "props": {"maxLines": 1}})).unwrap();
s.execute("node.set", &json!({"id": t, "props": {"height": 30}})).unwrap();
assert_eq!((resize_mode(&s, t), size(&s, t).1), (TextAutoResize::Truncate, 30.0));
// Other text still becomes a truncating box with max lines.
// Fixed-size text still becomes a truncating box with max lines.
let fixed = text(&mut s, "Lorem", json!({"textAutoResize": "none", "width": 100, "height": 100}));
s.execute("text.maxLines", &json!({"ids": [fixed], "lines": 2})).unwrap();
assert_eq!(resize_mode(&s, fixed), TextAutoResize::Truncate);
}
#[test]
fn balance_and_pretty_wrap_styles_break_lines_as_documented() {
// Explore text properties: "Auto: Figma fits as many words as possible on each line before
// wrapping to the next." "Balance: Figma distributes text as evenly as possible across every
// line, so each line is close to the same length." "Pretty: Figma keeps each line full, but
// adjusts the last four lines to avoid an orphan -- a single word stranded alone on the last
// line." The synthetic font: 8 px per character at 16 px.
let font = test_mono_font();
let mut s = Session::new();
let t = text(&mut s, "aaa bbb ccc ddd eee", json!({"fontFamily": font, "fontSize": 16, "lineHeight": 24}));
s.execute("node.set", &json!({"id": t, "props": {"textAutoResize": "height", "width": 136}})).unwrap();
let lines = |s: &Session| -> Vec<(usize, usize)> {
let (l, _) = figcraft_text::layout_node(s.doc().unwrap().node(t).unwrap()).unwrap();
l.lines.iter().map(|l| (l.char_start, l.char_end)).collect()
};
// 136 px holds 17 characters: Auto fills the first line with four words and strands the fifth.
assert_eq!(lines(&s), [(0, 16), (16, 19)]);
// Balance: as even as the words allow, three and two.
s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "balance"}})).unwrap();
assert_eq!(lines(&s), [(0, 12), (12, 19)]);
assert_eq!(crate::inspect::node_json(s.doc().unwrap(), t, 0)["wrapStyle"], json!("balance"));
// Pretty: the stranded word gets company from the line before.
s.execute("text.wrapStyle", &json!({"ids": [t], "style": "pretty"})).unwrap();
assert_eq!(lines(&s), [(0, 12), (12, 19)]);
// Three lines of two-letter words in a 72 px box (nine characters): Auto strands "gg"; Pretty
// narrows the line before it alone ("aa bb cc" / "dd ee" / "ff gg"); Balance's narrowest
// width that still gives three lines (64 px) fills the first two lines as Auto does.
s.execute("node.set", &json!({"id": t, "props": {"characters": "aa bb cc dd ee ff gg", "width": 72, "wrapStyle": "auto"}})).unwrap();
assert_eq!(lines(&s), [(0, 9), (9, 18), (18, 20)]);
s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "pretty"}})).unwrap();
assert_eq!(lines(&s), [(0, 9), (9, 15), (15, 20)]);
s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "balance"}})).unwrap();
assert_eq!(lines(&s), [(0, 9), (9, 18), (18, 20)]);
// A last line of two words is no orphan: Pretty leaves Auto's lines; a text on one line is
// left alone whatever the style.
s.execute("node.set", &json!({"id": t, "props": {"characters": "aa bb cc dd ee ff gg hh", "wrapStyle": "pretty"}})).unwrap();
assert_eq!(lines(&s), [(0, 9), (9, 18), (18, 23)]);
s.execute("node.set", &json!({"id": t, "props": {"width": 400, "wrapStyle": "balance"}})).unwrap();
assert_eq!(lines(&s), [(0, 23)]);
// Dev Mode's CSS says `text-wrap` for Balance and Pretty and nothing for Auto; junk is refused.
let css = |s: &mut Session| s.execute("inspect.code", &json!({"id": t})).unwrap()["code"].as_str().unwrap().to_string();
assert!(css(&mut s).contains("text-wrap: balance;"), "{}", css(&mut s));
s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "pretty"}})).unwrap();
assert!(css(&mut s).contains("text-wrap: pretty;"));
s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "auto"}})).unwrap();
assert!(!css(&mut s).contains("text-wrap"));
assert!(s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "zigzag"}})).is_err());
assert!(s.execute("text.wrapStyle", &json!({"ids": [t], "style": "even"})).is_err());
// A word as wide as the box is never broken in two by Balance or Pretty: 80 px holds the ten
// letters, and every narrower width Balance could try would have to split them.
s.execute("node.set", &json!({"id": t, "props": {"characters": "abcdefghij klm", "width": 80, "wrapStyle": "balance"}})).unwrap();
assert_eq!(lines(&s), [(0, 11), (11, 14)]);
s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "pretty"}})).unwrap();
assert_eq!(lines(&s), [(0, 11), (11, 14)]);
// Hanging punctuation: a line starting with an opening mark has that much more room, and
// Pretty narrows it by as much, so the line before the orphan still gives a word away.
s.execute(
"node.set",
&json!({"id": t, "props": {"characters": "aa bb cc (dd ee ff gg", "width": 72, "hangingPunctuation": true, "wrapStyle": "auto"}}),
)
.unwrap();
assert_eq!(lines(&s), [(0, 9), (9, 19), (19, 21)]);
s.execute("node.set", &json!({"id": t, "props": {"wrapStyle": "pretty"}})).unwrap();
assert_eq!(lines(&s), [(0, 9), (9, 16), (16, 21)]);
}
#[test]
fn max_lines_on_auto_width_text_keeps_auto_width_and_hugs_that_many_lines() {
// "Max lines is available only if truncate text is enabled, and: Text resizing is set to
// auto height or auto width" (Explore text properties): an auto-width text with max lines
// stays auto width, growing with its longest line and hugging up to that many lines.
use figcraft_doc::TextAutoResize;
// The synthetic font: every character 8 px wide at 16 px, so the widths are the same
// everywhere and never depend on what the system has installed.
let font = test_mono_font();
let mut s = Session::new();
let t = text(&mut s, "one\ntwo\nthree", json!({"fontFamily": font, "fontSize": 16, "lineHeight": 24}));
assert_eq!(resize_mode(&s, t), TextAutoResize::WidthAndHeight);
assert_eq!(size(&s, t), (40.0, 72.0), "three lines tall, as wide as 'three'");
s.execute("text.maxLines", &json!({"ids": [t], "lines": 2})).unwrap();
assert_eq!(resize_mode(&s, t), TextAutoResize::WidthAndHeight, "max lines keep auto width");
assert_eq!(size(&s, t), (32.0, 48.0), "two lines tall, as wide as the widest line it shows with its ellipsis (two…), not the hidden third");
assert_eq!(crate::inspect::node_json(s.doc().unwrap(), t, 0)["maxLines"], json!(2));
// Still auto width: a longer line widens the box.
s.execute("text.edit.begin", &json!({"id": t, "caret": 3})).unwrap();
s.execute("text.edit.insert", &json!({"text": " and a longer line"})).unwrap();
crate::textedit::end(&mut s).unwrap();
assert_eq!(size(&s, t), (168.0, 48.0), "the box grew with its longest line (21 characters)");
assert_eq!(resize_mode(&s, t), TextAutoResize::WidthAndHeight);
// No limit: all of its lines again.
s.execute("node.set", &json!({"id": t, "props": {"maxLines": 0}})).unwrap();
assert_eq!(size(&s, t).1, 72.0);
}
#[test]
fn superscript_and_subscript_are_synthesised_without_glyphs_for_them() {
// "If it isn't provided, Figma draws a synthesized version by using the font's standard
// version of the character, shrinking it, and positioning it accordingly" (Explore text
// properties). The synthetic font has no sups or subs feature and no OS/2 metrics, so the
// usual 0.65 em at 0.35 em up (superscript) or 0.14 em down (subscript) apply.
let font = test_mono_font();
let mut s = Session::new();
let t = text(&mut s, "x2", json!({"fontFamily": font, "fontSize": 40}));
let glyphs = |s: &Session| -> Vec<(f64, f64, f64)> {
let (l, _) = figcraft_text::layout_node(s.doc().unwrap().node(t).unwrap()).unwrap();
l.glyphs.iter().map(|g| (g.size, g.y, g.advance)).collect()
};
let plain = glyphs(&s);
assert_eq!(plain.len(), 2);
assert_eq!((plain[0].0, plain[0].2), (40.0, 20.0));
assert_eq!(size(&s, t).0, 40.0);
s.execute("text.setFeatures", &json!({"ids": [t], "features": {"sups": true}})).unwrap();
let sup = glyphs(&s);
for (g, p) in sup.iter().zip(&plain) {
assert!((g.0 - 26.0).abs() < 1e-6 && (g.2 - 13.0).abs() < 1e-6, "shrunk to 0.65 em, the advance with it: {g:?}");
assert!((p.1 - g.1 - 14.0).abs() < 1e-6, "raised 0.35 em: {g:?} against {p:?}");
}
assert!((size(&s, t).0 - 26.0).abs() < 1e-6, "the auto-width box hugs the smaller glyphs: {:?}", size(&s, t));
s.execute("text.setFeatures", &json!({"ids": [t], "features": {"sups": null, "subs": true}})).unwrap();
let sub = glyphs(&s);
for (g, p) in sub.iter().zip(&plain) {
assert!((g.0 - 26.0).abs() < 1e-6 && (g.1 - p.1 - 5.6).abs() < 1e-6, "shrunk, and lowered 0.14 em: {g:?} against {p:?}");
}
// Capitalised, the same: the synthesis follows the characters shaping saw.
s.execute("node.set", &json!({"id": t, "props": {"textCase": "upper"}})).unwrap();
s.execute("text.setFeatures", &json!({"ids": [t], "features": {"subs": null, "sups": true}})).unwrap();
for (g, p) in glyphs(&s).iter().zip(&plain) {
assert!((g.0 - 26.0).abs() < 1e-6 && (p.1 - g.1 - 14.0).abs() < 1e-6, "upper case, superscript: {g:?} against {p:?}");
}
s.execute("node.set", &json!({"id": t, "props": {"textCase": "original"}})).unwrap();
s.execute("text.setFeatures", &json!({"ids": [t], "features": {"sups": null, "subs": false}})).unwrap();
assert_eq!(glyphs(&s), plain, "off again");
}
/// A synthetic monospaced TrueType font (outline-less glyphs, every printable ASCII character 500 of
/// 1000 units wide), loaded into the font database so text measures the same on every machine.
fn test_mono_font() -> &'static str {
crates/engine/src/text_link_tests.rs
+42
View File
@@ -0,0 +1,42 @@
//! Alt+Enter while editing text activates the link at the caret ("When editing text, press
//! ⌥Option Return/Alt Enter to activate a focused link", Accessibility at Figma): `text.openLink`
//! hands a web or mail link at the caret to the UI, refuses other schemes, and does nothing where
//! there is no link.
use serde_json::json;
use crate::Session;
use crate::params::id_of;
#[test]
fn the_link_at_the_caret_goes_to_the_ui_and_only_a_web_or_mail_link() {
let mut s = Session::new();
let t = id_of(&s.execute("text.create", &json!({"text": "See the docs now", "x": 0, "y": 0})).unwrap()["id"]).unwrap();
s.execute("text.style", &json!({"id": t, "start": 4, "end": 12, "hyperlink": "https://example.com/docs"})).unwrap();
assert!(s.execute("text.openLink", &json!({})).is_err(), "nothing to activate while no text is edited");
s.execute("text.edit.begin", &json!({"id": t, "caret": 6})).unwrap();
let r = s.execute("text.openLink", &json!({})).unwrap();
assert_eq!(r["url"], "https://example.com/docs");
let req = s.ui_requests.iter().find(|r| r.kind == "open.url").expect("a UI request to open it");
assert_eq!(req.data["url"], "https://example.com/docs");
assert!(s.ds().unwrap().text_edit.is_some(), "still editing");
// Right after the link's last char the caret still counts as on it; before its start it doesn't.
s.execute("text.edit.caret", &json!({"index": 12})).unwrap();
assert_eq!(s.execute("text.openLink", &json!({})).unwrap()["url"], "https://example.com/docs");
s.execute("text.edit.caret", &json!({"index": 2})).unwrap();
assert!(s.execute("text.openLink", &json!({})).unwrap()["url"].is_null(), "no link there");
// A selection: its start decides.
s.execute("text.edit.caret", &json!({"index": 14})).unwrap();
s.execute("text.edit.caret", &json!({"index": 8, "extend": true})).unwrap();
assert_eq!(s.execute("text.openLink", &json!({})).unwrap()["url"], "https://example.com/docs");
// Mail links open; anything that isn't a web or mail link is refused and nothing is requested.
s.execute("text.style", &json!({"id": t, "start": 4, "end": 12, "hyperlink": "mailto:hello@example.com"})).unwrap();
s.execute("text.edit.caret", &json!({"index": 6})).unwrap();
assert_eq!(s.execute("text.openLink", &json!({})).unwrap()["url"], "mailto:hello@example.com");
let before = s.ui_requests.len();
for bad in ["javascript:alert(1)", "file:///etc/passwd", "example.com/docs"] {
s.execute("text.style", &json!({"id": t, "start": 4, "end": 12, "hyperlink": bad})).unwrap();
assert!(s.execute("text.openLink", &json!({})).is_err(), "{bad} is refused");
}
assert_eq!(s.ui_requests.len(), before, "nothing requested for a refused link");
}
crates/engine/src/text_tail_tests.rs
+22
View File
@@ -129,6 +129,28 @@ fn list_keys_at_list_items() {
"silent: Backspace at an item's start removes its bullet",
),
("a\nbc", vec![(B, 0), (B, 0)], 4, "Backspace", false, "a\nb", vec![(B, 0), (B, 0)], "Backspace inside an item deletes text"),
(
"a\nb",
vec![(B, 0), (B, 1)],
2,
"Backspace",
false,
"a\nb",
vec![(B, 0), (P, 1)],
"Backspace at a nested item's start removes its bullet and keeps its level",
),
("a\nb", vec![(N, 0), (N, 2)], 2, "Delete", false, "a\nb", vec![(N, 0), (P, 2)], "Delete at an item's start does the same"),
("a\nbc", vec![(B, 0), (B, 1)], 3, "Delete", false, "a\nb", vec![(B, 0), (B, 1)], "Delete inside an item deletes text"),
(
"a\nb",
vec![(B, 0), (P, 1)],
2,
"Tab",
false,
"a\n\tb",
vec![(B, 0), (P, 1)],
"a plain paragraph at a level isn't an item: Tab types a tab",
),
("a\nb", vec![(P, 0), (P, 0)], 3, "Tab", false, "a\nb\t", vec![(P, 0), (P, 0)], "outside a list Tab types a tab"),
("a", vec![(B, 8)], 1, "Tab", false, "a", vec![(B, 8)], "silent: nesting stops at 8 levels"),
];
crates/engine/src/view_state.rs
+4
View File
@@ -38,6 +38,9 @@ pub struct ViewState {
pub snap_objects: bool,
pub snap_pixel: bool,
pub ui_hidden: bool,
/// Minimized interface (Shift+Cmd/Ctrl+\): the navigation bar and both sidebars are collapsed
/// and the toolbar stays; the right sidebar shows while something is selected.
pub ui_minimized: bool,
}
impl Default for ViewState {
@@ -67,6 +70,7 @@ impl Default for ViewState {
snap_objects: true,
snap_pixel: true,
ui_hidden: false,
ui_minimized: false,
}
}
}
crates/format/src/fig.rs
+17 -9
View File
@@ -72,6 +72,9 @@ use kiwi::{Kv, Schema};
/// Largest `canvas.fig` member read, and largest decompressed chunk.
const MAX_CANVAS: u64 = 256 * 1024 * 1024;
const MAX_CHUNK: u64 = 512 * 1024 * 1024;
/// Largest decompressed schema chunk: Figma's schema unpacks to well under 1 MB, so a schema that
/// inflates past this is refused before its definitions are decoded.
const MAX_SCHEMA: u64 = 16 * 1024 * 1024;
/// Largest image member read.
const MAX_IMAGE: u64 = figcraft_doc::ImageData::MAX_BYTES;
/// Total decompressed ZIP image bytes read per import: the native image budget (`IMAGE_BUDGET`) on
@@ -324,7 +327,7 @@ fn decode_canvas(canvas: &[u8]) -> Result<(Schema, Vec<u8>), FormatError> {
let (Some(schema), Some(message)) = (it.next(), it.next()) else {
return Err(corrupt("canvas.fig needs a schema and a message chunk"));
};
let schema = Schema::decode(&inflate(schema)?).map_err(|e| corrupt(e.to_string()))?;
let schema = Schema::decode(&inflate_within(schema, MAX_SCHEMA)?).map_err(|e| corrupt(e.to_string()))?;
Ok((schema, inflate(message)?))
}
@@ -347,18 +350,23 @@ fn chunks(canvas: &[u8]) -> Result<Vec<&[u8]>, FormatError> {
/// Decompress a chunk: zstd (by its magic number), else raw deflate, else zlib.
fn inflate(data: &[u8]) -> Result<Vec<u8>, FormatError> {
fn capped(r: impl Read) -> Option<Vec<u8>> {
inflate_within(data, MAX_CHUNK)
}
/// [`inflate`] refusing a chunk that unpacks to more than `max` bytes.
fn inflate_within(data: &[u8], max: u64) -> Result<Vec<u8>, FormatError> {
let capped = |r: &mut dyn Read| -> Option<Vec<u8>> {
let mut out = Vec::new();
r.take(MAX_CHUNK + 1).read_to_end(&mut out).ok()?;
(out.len() as u64 <= MAX_CHUNK).then_some(out)
}
r.take(max.saturating_add(1)).read_to_end(&mut out).ok()?;
(out.len() as u64 <= max).then_some(out)
};
if data.starts_with(&[0x28, 0xB5, 0x2F, 0xFD]) {
let mut src = data;
let dec = ruzstd::decoding::StreamingDecoder::new(&mut src).map_err(|e| corrupt(format!("zstd: {e}")))?;
return capped(dec).ok_or_else(|| corrupt("damaged or oversized zstd chunk"));
let mut dec = ruzstd::decoding::StreamingDecoder::new(&mut src).map_err(|e| corrupt(format!("zstd: {e}")))?;
return capped(&mut dec).ok_or_else(|| corrupt("damaged or oversized zstd chunk"));
}
capped(flate2::read::DeflateDecoder::new(data))
.or_else(|| capped(flate2::read::ZlibDecoder::new(data)))
capped(&mut flate2::read::DeflateDecoder::new(data))
.or_else(|| capped(&mut flate2::read::ZlibDecoder::new(data)))
.ok_or_else(|| corrupt("damaged or oversized deflate chunk"))
}
crates/format/src/fig/export/layer.rs
+4 -1
View File
@@ -91,7 +91,10 @@ impl<'d> Exporter<'d> {
NodeKind::Group => f.push(("resizeToFit", b(true))),
NodeKind::Section { contents_hidden } => f.push(("sectionContentsHidden", b(*contents_hidden))),
NodeKind::Ellipse { start, sweep, inner } => {
f.push(("arcData", o(vec![("startingAngle", fl(*start)), ("endingAngle", fl(start + sweep)), ("innerRadius", fl(*inner))])))
// Within a turn, where a 32-bit angle still holds the start and the sweep exactly
// enough; a start past a turn draws the same.
let start = crate::rest::start_within_a_turn(*start);
f.push(("arcData", o(vec![("startingAngle", fl(start)), ("endingAngle", fl(start + sweep)), ("innerRadius", fl(*inner))])))
}
NodeKind::Polygon { count } => f.push(("count", u(*count))),
NodeKind::Star { count, inner_ratio } => f.extend([("count", u(*count)), ("starInnerScale", fl(*inner_ratio))]),
crates/format/src/fig/export_tests.rs
+24
View File
@@ -1611,3 +1611,27 @@ fn a_whole_ellipse_starting_anywhere_comes_back_whole() {
}
}
}
/// An ellipse whose start has gone round many times (a start typed in degrees past a few hundred
/// turns) comes back drawn the same: the same sweep, and a start the same way round.
#[test]
fn an_ellipse_starting_many_turns_round_comes_back_the_same() {
let tau = std::f64::consts::TAU;
// Not all of them hold exactly as 32-bit floats, the way a start typed in degrees doesn't.
for start in [999.0, 1500.0, -5000.0, 1e6, 1e6 + 0.1, 1234.567] {
for sweep in [tau, -tau, 1.0, -2.5, 1.3, tau - 0.1] {
let mut doc = Document::new("turns");
let page = doc.first_page().unwrap();
doc.create(page, NodeKind::Ellipse { start, sweep, inner: 0.0 }, "Ellipse", 0.0, 0.0, 100.0, 100.0).unwrap();
let (bytes, _) = export(&doc, None).unwrap();
let (back, _) = import(&bytes, "x").unwrap();
let kinds: Vec<NodeKind> =
back.ids().filter_map(|id| back.node(id)).map(|n| n.kind.clone()).filter(|k| matches!(k, NodeKind::Ellipse { .. })).collect();
let Some(NodeKind::Ellipse { start: s, sweep: w, .. }) = kinds.first() else { panic!("start {start}: no ellipse") };
// Where the arc starts, the same way round (as close as a 32-bit angle holds it).
let off = (s - start).rem_euclid(tau);
assert!(off.min(tau - off) < 1e-5, "start {start}, sweep {sweep}: came back starting at {s}");
assert!((w - sweep).abs() < 1e-5, "start {start}, sweep {sweep}: came back sweeping {w}");
}
}
}
crates/format/src/fig/kiwi.rs
+29 -5
View File
@@ -6,6 +6,7 @@
//! Everything here reads untrusted bytes: reads are bounds-checked, nesting is capped, array
//! counts can't exceed the bytes left, and the total number of decoded values is capped.
use std::collections::HashMap;
use std::fmt;
/// Deepest struct/message nesting decoded.
@@ -32,6 +33,9 @@ const MAX_VALUES: usize = 32 << 20;
/// Most definitions in a schema, and fields in one definition.
const MAX_DEFS: usize = 10_000;
const MAX_FIELDS: usize = 10_000;
/// Most fields in a schema, every definition together: Figma's own schema has a few thousand, and
/// without a total a schema of [`MAX_DEFS`] wide definitions could hold 100 million field records.
const MAX_SCHEMA_FIELDS: usize = 200_000;
#[derive(Debug, PartialEq, Eq)]
pub struct KiwiError(pub String);
@@ -252,6 +256,7 @@ impl Schema {
}
let mut defs = Vec::with_capacity(count);
let mut raw_types = Vec::new();
let mut total_fields = 0usize;
for _ in 0..count {
let name = r.string()?;
let kind = match r.byte()? {
@@ -261,7 +266,8 @@ impl Schema {
k => return err(format!("schema: unknown definition kind {k}")),
};
let n = r.var_uint()? as usize;
if n > MAX_FIELDS || n > r.left() {
total_fields = total_fields.saturating_add(n);
if n > MAX_FIELDS || n > r.left() || total_fields > MAX_SCHEMA_FIELDS {
return err("schema: too many fields");
}
let mut fields = Vec::with_capacity(n);
@@ -308,7 +314,7 @@ impl Schema {
/// [`Self::decode_message`] within `budget` values (see [`value_budget`]).
pub fn decode_message_within<'s>(&'s self, root: usize, data: &[u8], budget: usize) -> Result<Kv<'s>, KiwiError> {
let mut d = Decoder { schema: self, r: Reader { data, pos: 0 }, budget };
let mut d = Decoder { schema: self, r: Reader { data, pos: 0 }, budget, ids: vec![None; self.defs.len()] };
d.def(root, 0)
}
}
@@ -322,6 +328,10 @@ struct Decoder<'s, 'b> {
schema: &'s Schema,
r: Reader<'b>,
budget: usize,
/// Per definition, the index of the first field with each id (message field ids, enum
/// values), built the first time the definition is decoded: a message can carry many tags
/// against a wide definition, and a scan per tag would multiply the two.
ids: Vec<Option<HashMap<u32, usize>>>,
}
impl<'s> Decoder<'s, '_> {
@@ -330,6 +340,19 @@ impl<'s> Decoder<'s, '_> {
Ok(())
}
/// The first field of definition `i` with id (or enum value) `id`.
fn field_by_id(&mut self, i: usize, id: u32) -> Option<&'s Field> {
let fields = &self.schema.defs.get(i)?.fields;
let ids = self.ids.get_mut(i)?.get_or_insert_with(|| {
let mut m = HashMap::with_capacity(fields.len());
for (j, f) in fields.iter().enumerate() {
m.entry(f.value).or_insert(j);
}
m
});
fields.get(*ids.get(&id)?)
}
fn def(&mut self, i: usize, depth: usize) -> Result<Kv<'s>, KiwiError> {
if depth > MAX_DEPTH {
return err("message: nested too deeply");
@@ -340,7 +363,7 @@ impl<'s> Decoder<'s, '_> {
match d.kind {
Kind::Enum => {
let v = self.r.var_uint()?;
Ok(d.fields.iter().find(|f| f.value == v).map_or(Kv::Uint(u64::from(v)), |f| Kv::Enum(f.name.as_str())))
Ok(self.field_by_id(i, v).map_or(Kv::Uint(u64::from(v)), |f| Kv::Enum(f.name.as_str())))
}
Kind::Struct => {
let mut out = Vec::with_capacity(d.fields.len());
@@ -358,7 +381,7 @@ impl<'s> Decoder<'s, '_> {
out.shrink_to_fit();
return Ok(Kv::Object(out));
}
let f = d.fields.iter().find(|f| f.value == id).ok_or_else(|| KiwiError(format!("message: {} has no field {id}", d.name)))?;
let f = self.field_by_id(i, id).ok_or_else(|| KiwiError(format!("message: {} has no field {id}", d.name)))?;
out.push((f.name.as_str(), self.field(f, depth)?));
}
}
@@ -379,8 +402,9 @@ impl<'s> Decoder<'s, '_> {
if n > self.r.left() {
return err("message: array longer than the data");
}
// The field itself counts, so empty arrays can't pile up for free.
self.spend(1)?;
if ty == Type::Byte {
self.spend(1)?;
return Ok(Kv::Bytes(self.r.take(n)?.to_vec()));
}
self.spend(n)?;
crates/format/src/fig/tests.rs
+54
View File
@@ -1179,6 +1179,60 @@ fn scalar_fields_count_against_the_value_budget() {
assert!(sc.decode_message_within(0, &data, 1001).is_ok());
}
#[test]
fn empty_arrays_count_against_the_value_budget() {
// 1000 empty `uint[]` fields: each field is a value even with no elements, so a small budget
// can't be outgrown by piling up empty containers.
let fields = vec![Field { name: "a".into(), ty: Some(Type::Uint), array: true, value: 1 }];
let sc = Schema { defs: vec![Def { name: "Message".into(), kind: Kind::Message, fields }] };
let mut data = [1u8, 0].repeat(1000);
data.push(0);
let e = sc.decode_message_within(0, &data, 10).unwrap_err();
assert_eq!(e.0, "message: too many values");
assert!(sc.decode_message_within(0, &data, 1001).is_ok());
}
#[test]
fn message_tags_find_their_field_by_id_in_a_wide_definition() {
// A wide definition: every tag is looked up by id, and the first field with an id wins, as
// before the lookup was indexed.
let mut fields: Vec<Field> = (1..=5000).map(|i| Field { name: format!("f{i}"), ty: Some(Type::Bool), array: false, value: i }).collect();
fields.push(Field { name: "shadow".into(), ty: Some(Type::Bool), array: false, value: 7 });
let sc = Schema { defs: vec![Def { name: "Message".into(), kind: Kind::Message, fields }] };
let mut w = encode::Writer::default();
for _ in 0..20_000 {
w.var_uint(5000);
w.byte(1);
}
w.var_uint(7);
w.byte(0);
w.var_uint(0);
let Kv::Object(out) = sc.decode_message(0, &w.0).unwrap() else { panic!() };
assert_eq!(out.len(), 20_001);
assert!(out.iter().take(20_000).all(|(n, v)| *n == "f5000" && *v == Kv::Bool(true)));
assert_eq!(out.last().map(|(n, _)| *n), Some("f7"));
}
#[test]
fn a_schema_is_refused_past_its_total_field_count() {
// 25 definitions of 10 000 fields each: every one is within the per-definition cap, but
// together they pass the schema's total.
let mut w = encode::Writer::default();
w.var_uint(25);
for d in 0..25 {
w.string(&format!("D{d}"));
w.byte(0);
w.var_uint(10_000);
for i in 0..10_000u32 {
w.string("");
w.var_int(0);
w.byte(0);
w.var_uint(i);
}
}
assert_eq!(Schema::decode(&w.0).unwrap_err().0, "schema: too many fields");
}
#[test]
fn hostile_input_is_refused() {
// A message that contains itself, nested past the depth cap.
crates/format/src/penpot.rs
+78 -14
View File
@@ -2030,27 +2030,51 @@ fn token_theme_groups<'a>(value: &'a Value, tokens: &BTreeMap<&str, BTreeMap<Str
}
/// Drops the resolved tokens that alias a variable which isn't being made, until none does; how
/// many were dropped.
/// many were dropped. Each token is looked at once to start with, and again only when a variable
/// it aliases goes: a chain of aliases dropped one link per round would otherwise rescan every
/// token per link.
fn drop_dangling_aliases(
resolved: &mut BTreeMap<&str, (usize, VariableType, BTreeMap<String, VariableValue>)>,
var_id: &dyn Fn(&str) -> String,
) -> usize {
let mut dropped = 0;
loop {
let ids: BTreeSet<String> = resolved.keys().map(|p| var_id(p)).collect();
let dangling: Vec<&str> = resolved
.iter()
.filter(|(_, (_, _, values))| values.values().any(|v| matches!(v, VariableValue::Alias(target) if !ids.contains(target))))
.map(|(path, _)| *path)
.collect();
if dangling.is_empty() {
return dropped;
// How many tokens make each variable id, and the tokens aliasing each id.
let mut makers: BTreeMap<String, usize> = BTreeMap::new();
for path in resolved.keys() {
*makers.entry(var_id(path)).or_default() += 1;
}
let mut aliased_by: BTreeMap<&str, Vec<&str>> = BTreeMap::new();
let mut gone: Vec<&str> = Vec::new();
for (path, (_, _, values)) in resolved.iter() {
let mut dangling = false;
for v in values.values() {
if let VariableValue::Alias(target) = v {
dangling |= !makers.contains_key(target);
aliased_by.entry(target.as_str()).or_default().push(*path);
}
}
dropped += dangling.len();
for path in dangling {
resolved.remove(path);
if dangling {
gone.push(*path);
}
}
let mut dropped: BTreeSet<&str> = gone.iter().copied().collect();
while let Some(path) = gone.pop() {
let id = var_id(path);
let Some(left) = makers.get_mut(&id) else { continue };
*left -= 1;
if *left > 0 {
continue;
}
makers.remove(&id);
for &by in aliased_by.get(id.as_str()).into_iter().flatten() {
if dropped.insert(by) {
gone.push(by);
}
}
}
for path in &dropped {
resolved.remove(path);
}
dropped.len()
}
/// Moves a base token whose expression refers to a themed token into that token's collection, so
@@ -6515,3 +6539,43 @@ mod tests {
assert_eq!(button.interactions.len(), 1, "the prototype link survives the round trip");
}
}
#[cfg(test)]
mod dangling_alias_tests {
use super::*;
type Resolved<'a> = BTreeMap<&'a str, (usize, VariableType, BTreeMap<String, VariableValue>)>;
fn token(alias: Option<&str>) -> (usize, VariableType, BTreeMap<String, VariableValue>) {
let value = alias.map_or(VariableValue::Number(1.0), |a| VariableValue::Alias(format!("v:{a}")));
(0, VariableType::Number, [("m".to_string(), value)].into())
}
#[test]
fn a_chain_ending_in_a_missing_variable_is_dropped_whole() {
// t0 → t1 → … → t1999 → missing: every link goes, in one pass along the chain.
let names: Vec<String> = (0..2000).map(|i| format!("t{i}")).collect();
let mut resolved: Resolved = BTreeMap::new();
for (i, n) in names.iter().enumerate() {
let next = names.get(i + 1).map_or("missing", String::as_str);
resolved.insert(n, token(Some(next)));
}
resolved.insert("plain", token(None));
resolved.insert("to-plain", token(Some("plain")));
let var_id = |p: &str| format!("v:{p}");
assert_eq!(drop_dangling_aliases(&mut resolved, &var_id), 2000);
assert_eq!(resolved.keys().copied().collect::<Vec<_>>(), ["plain", "to-plain"]);
}
#[test]
fn a_variable_made_by_two_tokens_stays_while_one_does() {
// `a` and `b` both make `v:x`; `a` dangles, `b` doesn't, so `c` (aliasing `v:x`) stays.
let mut resolved: Resolved = BTreeMap::new();
resolved.insert("a", token(Some("missing")));
resolved.insert("b", token(None));
resolved.insert("c", token(Some("x")));
let var_id = |p: &str| if p == "a" || p == "b" { "v:x".to_string() } else { format!("v:{p}") };
assert_eq!(drop_dangling_aliases(&mut resolved, &var_id), 1);
assert_eq!(resolved.keys().copied().collect::<Vec<_>>(), ["b", "c"]);
}
}
crates/format/src/rest.rs
+37 -6
View File
@@ -626,15 +626,27 @@ impl<'a> Ctx<'a> {
"ELLIPSE" => {
let a = j.get("arcData");
let arc = |k: &str| a.and_then(|a| num(a, k));
let start = arc("startingAngle").unwrap_or(0.0).clamp(-1e3, 1e3);
let end = arc("endingAngle").map_or(start + std::f64::consts::TAU, |e| e.clamp(-1e3, 1e3));
let tau = std::f64::consts::TAU;
// Capped only so the difference stays finite: the sweep is the difference of the
// angles as written, wherever they lie.
let start = arc("startingAngle").unwrap_or(0.0).clamp(-1e15, 1e15);
// No end goes all the way round, however far out the start is.
let end = arc("endingAngle").map(|e| e.clamp(-1e15, 1e15));
// The angles are 32-bit floats: a whole turn from anywhere but zero comes out a
// hair short of 2π as often as not. Within their precision of a turn, it is one.
let precision = (start.abs() + end.abs() + tau) * f64::from(f32::EPSILON);
let sweep = end - start;
let sweep = if sweep.abs() >= tau - precision { tau.copysign(sweep) } else { sweep };
NodeKind::Ellipse { start, sweep: sweep.clamp(-tau, tau), inner: arc("innerRadius").unwrap_or(0.0).clamp(0.0, 1.0) }
// Far enough out (thousands of radians) that precision is too coarse to tell a
// whole turn from a nearly whole arc, the sweep is kept as written.
let sweep = end.map_or(tau, |end| {
let precision = (start.abs() + end.abs() + tau) * f64::from(f32::EPSILON);
let sweep = end - start;
let whole = precision <= WHOLE_TURN_SLACK && sweep.abs() >= tau - precision;
if whole { tau.copysign(sweep) } else { sweep }
});
NodeKind::Ellipse {
start: start_within_a_turn(start),
sweep: sweep.clamp(-tau, tau),
inner: arc("innerRadius").unwrap_or(0.0).clamp(0.0, 1.0),
}
}
// Point counts aren't part of the documented JSON: the outline is exact when present.
"REGULAR_POLYGON" | "STAR" if point_count().is_none() && has_geometry => NodeKind::Vector { network: VectorNetwork::default() },
@@ -1509,3 +1521,22 @@ pub fn missing_image_placeholder() -> Option<&'static [u8]> {
pub fn is_missing_image(data: &ImageData) -> bool {
missing_image_placeholder().is_some_and(|png| data.bytes.as_slice() == png)
}
/// The most a sweep may fall short of a turn and still be read as a whole one (radians, about
/// 0.06°): far more than 32-bit angles round by within a few hundred turns of zero, and far less
/// than any arc anyone draws.
const WHOLE_TURN_SLACK: f64 = 1e-3;
/// An ellipse's start brought within a turn, drawn the same: a start already within one is kept
/// as it is, one past a turn comes to [0, 2π). It is reduced the way the renderer's sine and
/// cosine see it, exactly, rather than by dividing by a rounded 2π, which drifts a little with
/// every turn.
pub(crate) fn start_within_a_turn(start: f64) -> f64 {
let tau = std::f64::consts::TAU;
if !start.is_finite() || start.abs() < tau {
return start;
}
// `rem_euclid` rounds a hair below zero up to 2π itself.
let within = start.sin().atan2(start.cos()).rem_euclid(tau);
if within < tau { within } else { 0.0 }
}
crates/format/src/rest/tests.rs
+41
View File
@@ -756,3 +756,44 @@ fn the_fig_import_sets_its_own_layer_cap() {
assert_eq!(doc.node_count(), 5);
assert!(warnings.iter().any(|w| w.contains("more than 4 layers")), "{warnings:?}");
}
/// Angles written many turns round keep the arc they draw: the sweep is the difference as
/// written, and the start comes within a turn of zero, the same way round.
#[test]
fn an_arc_written_many_turns_round_keeps_its_sweep() {
let tau = std::f64::consts::TAU;
for (start, end) in [
(999.0, 999.0 + tau),
(1500.0, 1501.0),
(-5000.0, -5000.0 - 2.5),
(1e6, 1e6 + tau),
(1e6, 1e6 + 5.9),
(1e6, 1e6 + 6.1),
(3e7, 3e7),
(-4e5, -4e5 + tau - 0.01),
(-182.212373908208, -182.212373908208 + tau),
] {
let mut arc = json!({"id": "Arc", "name": "Arc", "type": "ELLIPSE", "relativeTransform": at(0.0, 0.0), "size": {"x": 10, "y": 10}});
arc["arcData"] = json!({"startingAngle": start, "endingAngle": end, "innerRadius": 0});
let (doc, _) = one(json!([arc]));
let NodeKind::Ellipse { start: s, sweep, .. } = named(&doc, "Arc").kind else { panic!("{start}: not an ellipse") };
let want = end - start;
let want = if (want.abs() - tau).abs() < 1e-6 { tau.copysign(want) } else { want };
assert!((sweep - want).abs() < 1e-9, "{start}..{end}: sweep {sweep}, not {want}");
assert!(s.abs() < tau, "{start}: start {s} left past a turn");
let off = (s - start).rem_euclid(tau);
assert!(off.min(tau - off) < 1e-6, "{start}: start {s} isn't the same way round");
}
}
/// An arc with a start but no end goes all the way round, however far out the start is.
#[test]
fn an_arc_without_an_end_is_whole_wherever_it_starts() {
for start in [0.0, 2.0, -5000.0, 1e8, 1e15] {
let mut arc = json!({"id": "Arc", "name": "Arc", "type": "ELLIPSE", "relativeTransform": at(0.0, 0.0), "size": {"x": 10, "y": 10}});
arc["arcData"] = json!({"startingAngle": start, "innerRadius": 0});
let (doc, _) = one(json!([arc]));
let NodeKind::Ellipse { sweep, .. } = named(&doc, "Arc").kind else { panic!("{start}: not an ellipse") };
assert_eq!(sweep, std::f64::consts::TAU, "start {start}");
}
}
crates/layout/src/lib.rs
+35 -13
View File
@@ -216,8 +216,9 @@ fn coherent_own_sizing(doc: &mut Document, id: NodeId) -> bool {
/// Padding `(top, right, bottom, left)` of an auto layout frame, sanitised, plus the frame's own
/// inside stroke (per side) when strokes are included in the layout; center and outside strokes
/// never take up space.
fn insets(f: &figcraft_doc::Node, al: &AutoLayout) -> (f64, f64, f64, f64) {
/// never take up space. The frame's size less these is its children's room, the "full available
/// space" a child resized to it fills.
pub fn insets(f: &figcraft_doc::Node, al: &AutoLayout) -> (f64, f64, f64, f64) {
let included = al.strokes_included && f.has_visible_stroke() && f.stroke.align == StrokeAlign::Inside;
let stroke = if included { f.stroke.sides.unwrap_or([f.stroke.weight; 4]) } else { [0.0; 4] };
let [pt, pr, pb, pl] = al.padding.map(|p| finite_or_zero(p).max(0.0));
@@ -327,6 +328,10 @@ struct Item {
max_main: Option<f64>,
min_cross: Option<f64>,
max_cross: Option<f64>,
/// The item's own insets along the main axis (an auto layout frame's padding and included
/// inside stroke): fill children share the free space by their content area, border-box
/// fashion, so these come on top of each one's share.
inset_main: f64,
/// Baseline alignment: distance from the item's top to its first baseline.
baseline: Option<f64>,
/// Baseline alignment: offset from the line's top (computed per line).
@@ -414,6 +419,10 @@ fn flow_items(doc: &Document, kids: &[NodeId], horizontal: bool, hug_main: bool,
let (sm, sc) = if horizontal { (cl.sizing_h, cl.sizing_v) } else { (cl.sizing_v, cl.sizing_h) };
let (min_main, max_main, min_cross, max_cross) =
if horizontal { (cl.min_w, cl.max_w, cl.min_h, cl.max_h) } else { (cl.min_h, cl.max_h, cl.min_w, cl.max_w) };
let inset_main = node.layout.as_ref().map_or(0.0, |al| {
let (pt, pr, pb, pl) = insets(node, al);
if horizontal { pl + pr } else { pt + pb }
});
items.push(Item {
id: *child,
main: if horizontal { w } else { h },
@@ -425,6 +434,7 @@ fn flow_items(doc: &Document, kids: &[NodeId], horizontal: bool, hug_main: bool,
max_main,
min_cross,
max_cross,
inset_main,
baseline: None,
base_off: 0.0,
});
@@ -596,19 +606,31 @@ pub fn layout_frame(doc: &mut Document, frame: NodeId, m: &dyn Measure) {
}
}
/// Share `free` main-axis space among the fill items `open` like CSS flexbox: each takes an equal
/// share within its min/max; when clamping adds more than it removes, the items held at their min
/// keep it (otherwise those held at their max do) and the rest share what is left again.
/// Share `free` among the fill items `open` by their content areas: each one's own insets (an
/// auto layout frame's padding and included inside stroke) come off the top and go back on its
/// share, so a child with more padding or a thicker inside stroke takes a little more and the
/// content areas come out the same, as in the CSS border-box model ("Figma distributes space
/// amongst fill container children by the children's content area instead of by their size").
/// Min and max sizes still clamp each item's outer size; the clamped ones are frozen and the rest
/// share what is left, as before.
fn distribute(items: &mut [Item], mut open: Vec<usize>, free: f64) {
let mut free = free.max(0.0);
while !open.is_empty() {
let share = free / open.len() as f64;
let sized: Vec<(usize, f64)> =
open.iter().filter_map(|i| items.get(*i).map(|it| (*i, clamp_size(share, it.min_main, it.max_main)))).collect();
let violation: f64 = sized.iter().map(|(_, v)| v - share).sum();
let frozen = |v: f64| violation.abs() < 1e-9 || (violation > 0.0 && v > share + 1e-9) || (violation < 0.0 && v < share - 1e-9);
for (i, v) in &sized {
if frozen(*v)
let insets: f64 = open.iter().filter_map(|i| items.get(*i)).map(|it| it.inset_main).sum();
let content_share = ((free - insets) / open.len() as f64).max(0.0);
let sized: Vec<(usize, f64, f64)> = open
.iter()
.filter_map(|i| {
items.get(*i).map(|it| {
let want = content_share + it.inset_main;
(*i, want, clamp_size(want, it.min_main, it.max_main))
})
})
.collect();
let violation: f64 = sized.iter().map(|(_, want, v)| v - want).sum();
let frozen = |want: f64, v: f64| violation.abs() < 1e-9 || (violation > 0.0 && v > want + 1e-9) || (violation < 0.0 && v < want - 1e-9);
for (i, want, v) in &sized {
if frozen(*want, *v)
&& let Some(it) = items.get_mut(*i)
{
it.main = *v;
@@ -616,7 +638,7 @@ fn distribute(items: &mut [Item], mut open: Vec<usize>, free: f64) {
}
}
free = free.max(0.0);
open = sized.into_iter().filter(|(_, v)| !frozen(*v)).map(|(i, _)| i).collect();
open = sized.into_iter().filter(|(_, want, v)| !frozen(*want, *v)).map(|(i, _, _)| i).collect();
}
}
crates/layout/src/nested_tests.rs
+42
View File
@@ -287,6 +287,48 @@ fn padding_and_included_strokes() {
assert_eq!(pos(&d, c), (15.0, 15.0, 70.0, 20.0));
}
/// "Figma distributes space amongst fill container children by the children's content area
/// instead of by their size, matching the CSS border-box model. A layer with a thicker stroke will
/// take up slightly more of the available width or height, so that its inner content area matches
/// its sibling's." (Use auto layout with CSS Flexbox in mind)
#[test]
fn fill_children_share_by_content_area() {
let mut d = Document::new("t");
let p = page(&d);
let f = al(&mut d, p, LayoutMode::Horizontal, (200.0, 50.0), (Sizing::Fixed, Sizing::Fixed));
layout_mut(&mut d, f).gap = 0.0;
let a = al(&mut d, f, LayoutMode::Horizontal, (10.0, 50.0), (Sizing::Fill, Sizing::Fixed));
let b = al(&mut d, f, LayoutMode::Horizontal, (10.0, 50.0), (Sizing::Fill, Sizing::Fixed));
layout_mut(&mut d, b).padding = [0.0, 20.0, 0.0, 20.0];
layout_frame(&mut d, f, &NoMeasure);
// 200 less b's 40 of padding leaves 160 of content, 80 each: a is 80 wide, b 120.
assert_eq!((size(&d, a).0, size(&d, b).0), (80.0, 120.0));
assert_eq!(pos(&d, b).0, 80.0);
// A 10 px inside stroke counted in b's layout instead: 90 and 110.
layout_mut(&mut d, b).padding = [0.0; 4];
{
let n = d.get_mut(b).unwrap();
n.strokes = vec![figcraft_doc::color::Paint::solid(figcraft_doc::color::Color::BLACK)];
n.stroke.weight = 10.0;
n.stroke.align = StrokeAlign::Inside;
}
layout_mut(&mut d, b).strokes_included = true;
layout_frame(&mut d, f, &NoMeasure);
assert_eq!((size(&d, a).0, size(&d, b).0), (90.0, 110.0));
// A stroke not counted in the layout is no inset: an even split, as before.
layout_mut(&mut d, b).strokes_included = false;
layout_frame(&mut d, f, &NoMeasure);
assert_eq!((size(&d, a).0, size(&d, b).0), (100.0, 100.0));
// Equal insets: still even. A max on a freezes it there and b takes the rest, insets kept.
layout_mut(&mut d, a).padding = [0.0, 20.0, 0.0, 20.0];
layout_mut(&mut d, b).padding = [0.0, 20.0, 0.0, 20.0];
layout_frame(&mut d, f, &NoMeasure);
assert_eq!((size(&d, a).0, size(&d, b).0), (100.0, 100.0));
d.get_mut(a).unwrap().child_layout.max_w = Some(60.0);
layout_frame(&mut d, f, &NoMeasure);
assert_eq!((size(&d, a).0, size(&d, b).0), (60.0, 140.0));
}
#[test]
fn grid_hug_tracks_and_wrapping_text_rows() {
use figcraft_doc::GridTrack;
crates/pathops/src/brush.rs
+3 -1
View File
@@ -131,7 +131,9 @@ pub fn outline(path: &BezPath, width: f64, props: &StrokeProps, brush: &Brush) -
let p = preset(&brush.preset)?;
let unit = shape(p.id)?;
let lines = polylines(path)?;
let scale = |t: f64| width * props.profile().map_or(1.0, |pr| pr.scale_at(t));
// Sanitized once: at most 64 points, so each sample's symmetry scan stays cheap.
let profile = props.profile().map(|pr| pr.sanitized());
let scale = |t: f64| width * profile.as_ref().map_or(1.0, |pr| pr.scale_at(t));
let mut out = BezPath::new();
match p.kind {
BrushKind::Stretch => {
crates/pathops/src/brush_tests.rs
+11
View File
@@ -72,3 +72,14 @@ fn a_width_profile_scales_the_brush() {
let (first, last) = (parts.first().unwrap().bounding_box(), parts.last().unwrap().bounding_box());
assert!(last.width() > first.width() * 3.0, "{first:?} {last:?}");
}
#[test]
fn an_unsanitized_profile_is_bounded_before_sampling() {
// 100k points, all past the 64-point cap and out of range: the brush reads the clamped profile.
let raw = WidthProfile { points: (0..100_000).map(|i| figcraft_doc::WidthPoint::new(f64::from(i), 1e300)).collect() };
let b = brush("taper");
let mut p = props(1.0, &b);
p.width_profile = Some(raw);
let out = outline(&line(50.0), 1.0, &p, &b).unwrap();
assert!(out.bounding_box().height() <= 2.0 * WidthProfile::MAX_SCALE);
}
crates/render/src/paint.rs
+3 -1
View File
@@ -79,11 +79,13 @@ fn diamond_pixmap(g: &Gradient, opacity: f32) -> Option<Arc<Pixmap>> {
const N: u32 = 256;
let mut p = Pixmap::new(N, N)?;
let half = f64::from(N) / 2.0;
// Sorted once for the 65 536 samples below, not once per sample.
let stops = g.sorted_stops();
for (i, px) in p.data_mut().as_chunks_mut::<4>().0.iter_mut().enumerate() {
let x = ((i as u32 % N) as f64 + 0.5 - half) / half;
let y = ((i as u32 / N) as f64 + 0.5 - half) / half;
let t = (x.abs() + y.abs()) as f32;
let c = g.sample(t);
let c = figcraft_color::sample_sorted(&stops, t);
let a = c.a * opacity;
let q = |v: f32| (v * a * 255.0).round().clamp(0.0, 255.0) as u8;
px.copy_from_slice(&[q(c.r), q(c.g), q(c.b), (a * 255.0).round().clamp(0.0, 255.0) as u8]);
crates/text/src/behaviour_tests.rs
+31 -1
View File
@@ -9,7 +9,7 @@
use super::*;
use crate::breaks::{break_between, grapheme_starts};
use figcraft_doc::{LeadingTrim, LetterSpacing, LineHeight, TextAlignH, TextAutoResize, TextData, TextDecoration};
use figcraft_doc::{LeadingTrim, LetterSpacing, LineHeight, ListStyle, ParaList, TextAlignH, TextAutoResize, TextData, TextDecoration};
/// The default face once system fonts are indexed (a Latin face where the system has one, so CJK
/// and emoji come from fallback faces), or None (skip) on a machine without fonts.
@@ -100,6 +100,36 @@ fn letter_spacing_percent_and_pixels() {
}
}
/// "Use Backspace or Delete at the beginning of a list item to delete the counter, but keep the
/// same level of indentation" (Create bulleted and numbered lists): a plain paragraph at a list
/// level starts where that level's item text starts, even once no list is left; a plain
/// paragraph at level 0 starts at the box as always.
#[test]
fn a_plain_paragraph_at_a_list_level_starts_where_the_items_text_does() {
if face().is_none() {
return;
}
let level = |list: ListStyle, indent: u8| ParaList { list, indent, start_offset: 0 };
let mut t = text("a\nb\nc", TextAutoResize::WidthAndHeight);
t.paragraphs = vec![level(ListStyle::Bulleted, 1), level(ListStyle::None, 1), level(ListStyle::None, 0)];
let l = layout(&t, None, None);
// Where a line's text starts: its first character's glyph (the indent is in the glyphs); a
// list marker shares that character and sits in the gutter to its left, so the text is the
// rightmost of them.
let text_x = |l: &TextLayout, li: usize| {
l.glyphs.iter().filter(|g| g.char_start == l.lines[li].char_start).map(|g| g.x).fold(f64::NAN, |a, b| if a.is_nan() { b } else { a.max(b) })
};
let (x0, x1, x2) = (text_x(&l, 0), text_x(&l, 1), text_x(&l, 2));
assert!((x1 - x0).abs() < EPS, "the plain paragraph keeps the item's text start: {x1} vs {x0}");
assert!(x0 > 20.0, "a nested item's text starts two gutters in: {x0}");
assert!(x2.abs() < EPS, "a level-0 plain paragraph starts at the box: {x2}");
// No list left at all: the level still indents, by the same gutters.
let mut alone = text("b", TextAutoResize::WidthAndHeight);
alone.paragraphs = vec![level(ListStyle::None, 1)];
let a = layout(&alone, None, None);
assert!((text_x(&a, 0) - x1).abs() < EPS, "{} vs {x1}", text_x(&a, 0));
}
#[test]
fn paragraph_spacing_and_indent() {
if face().is_none() {
crates/text/src/fontdb.rs
+18
View File
@@ -102,6 +102,11 @@ pub struct Face {
pub underline_pos: f64,
pub underline_thickness: f64,
pub strike_pos: f64,
/// Synthesised superscript and subscript (the OS/2 table's values, or the usual ones without
/// it): the glyph size as a fraction of the em, and the baseline shift up in font units
/// (negative for a subscript, which sits below).
pub superscript: (f64, f64),
pub subscript: (f64, f64),
pub shaper: harfrust::ShaperData,
/// OpenType GSUB feature tags the face provides (e.g. `smcp`).
gsub_features: Vec<[u8; 4]>,
@@ -179,6 +184,17 @@ impl Face {
let colr = has_table(b"COLR");
let under = m.underline.map(|d| (f64::from(d.offset), f64::from(d.thickness))).unwrap_or((-upem * 0.1, upem * 0.06));
let strike = m.strikeout.map(|d| f64::from(d.offset)).unwrap_or(ascent * 0.3);
// Superscript and subscript sizes and offsets: the OS/2 table's, else the usual 0.65 em,
// 0.35 em up and 0.14 em down (what common fonts carry); a zero counts as unset, as some
// fonts leave these fields.
let os2 = f.os2().ok();
let script = |size: Option<i16>, offset: Option<i16>, up: bool, usual_offset: f64| -> (f64, f64) {
let size = size.map(f64::from).filter(|v| *v > 0.0).map_or(0.65, |v| v / upem);
let offset = offset.map(f64::from).filter(|v| *v != 0.0).unwrap_or(usual_offset * upem);
(size, if up { offset } else { -offset })
};
let superscript = script(os2.as_ref().map(|t| t.y_superscript_y_size()), os2.as_ref().map(|t| t.y_superscript_y_offset()), true, 0.35);
let subscript = script(os2.as_ref().map(|t| t.y_subscript_y_size()), os2.as_ref().map(|t| t.y_subscript_y_offset()), false, 0.14);
let weight = {
let w = attrs.weight.value();
if w.is_finite() && w > 0.0 { w.round() as u16 } else { figcraft_doc::style_weight(&style) }
@@ -200,6 +216,8 @@ impl Face {
underline_pos: under.0,
underline_thickness: under.1.max(upem * 0.02),
strike_pos: strike,
superscript,
subscript,
shaper,
gsub_features,
track,
crates/text/src/layout.rs
+309 -48
View File
@@ -6,7 +6,7 @@ use std::sync::Arc;
use figcraft_doc::{
DecorationLength, DecorationStyle, LeadingTrim, LetterSpacing, LineHeight, ListStyle, ParaList, TextAlignH, TextAutoResize, TextCase, TextData,
TextDecoration, TextStyle, color::PaintKind, valid_feature_tag,
TextDecoration, TextStyle, WrapStyle, color::PaintKind, valid_feature_tag,
};
use figcraft_geom::{Affine, BezPath, Rect};
use harfrust::{Direction, Feature, ShapeOptions, ShaperInstance, Tag, UnicodeBuffer, Variation};
@@ -630,7 +630,8 @@ impl SavedStarts<'_> {
}
}
/// The lines (item range, paragraph end, paragraph), wrapped by measure or at `saved` line starts;
/// The lines (item range, paragraph end, paragraph), wrapped to `wrap_of` (the width for each line
/// of each paragraph; None: no wrapping) or at `saved` line starts;
/// None when a saved line would overflow its box by more than [`SAVED_LINE_SLACK`]. Lines break
/// where [`crate::breaks::break_between`] allows, and between the words `word_breaks` marks.
fn break_lines(
@@ -638,7 +639,7 @@ fn break_lines(
chars: &[char],
cluster_start: &[bool],
word_breaks: &[bool],
wrap: Option<f64>,
wrap_of: &WidthOf<'_>,
line_indent_of: &impl Fn(usize, bool, usize) -> f64,
rtl_para_at: &impl Fn(usize) -> bool,
hang_start: bool,
@@ -652,6 +653,7 @@ fn break_lines(
let mut last_break: Option<usize> = None;
let mut para_first_line = true;
let mut para = 0;
let mut line_in_para = 0;
while i < items.len() {
let Some(it) = items.get(i) else { break };
if it.ch == '\n' {
@@ -662,6 +664,7 @@ fn break_lines(
last_break = None;
para_first_line = true;
para += 1;
line_in_para = 0;
continue;
}
// A line separator (a soft break) breaks the line inside its paragraph: no
@@ -673,6 +676,7 @@ fn break_lines(
x = 0.0;
last_break = None;
para_first_line = false;
line_in_para += 1;
continue;
}
let line_indent = line_indent_of(para, para_first_line, it.char_start);
@@ -681,7 +685,7 @@ fn break_lines(
let ltr = !rtl_para_at(it.char_start);
let hung = items.get(line_start).filter(|f| hang_start && ltr && opens(f.ch)).map_or(0.0, |f| f.adv)
+ if hang_end && ltr && closes(it.ch) { w } else { 0.0 };
if let Some(maxw) = wrap
if let Some(maxw) = wrap_of(para, line_in_para)
&& i > line_start
&& !it.is_space()
{
@@ -702,6 +706,7 @@ fn break_lines(
x = 0.0;
last_break = None;
para_first_line = false;
line_in_para += 1;
continue;
}
}
@@ -721,6 +726,220 @@ fn break_lines(
Some(lines)
}
/// A line as [`break_lines`] gives it: item range, paragraph end, paragraph.
type LineRange = (usize, usize, bool, usize);
/// The width a line wraps to (its paragraph, the line's index in it); None: no wrapping.
type WidthOf<'a> = dyn Fn(usize, usize) -> Option<f64> + 'a;
/// [`break_lines`] with the widths and the saved starts to follow, the rest bound.
type Breaker<'a> = dyn Fn(&WidthOf<'_>, Option<SavedStarts<'_>>) -> Option<Vec<LineRange>> + 'a;
/// What a paragraph's lines wrap to under Balance or Pretty: the paragraph's width, and a
/// narrower one for a single line (the line Pretty has give a word away).
#[derive(Clone, Copy)]
struct ParaWidth {
width: f64,
line: Option<(usize, f64)>,
}
/// Whether the line's text is one word: no break opportunity between its items, its trailing
/// spaces and the paragraph's line break aside.
fn single_word(items: &[Item], word_breaks: &[bool], (start, end, _, _): LineRange) -> bool {
let Some(last) = (start..end).rev().find(|&k| items.get(k).is_some_and(|it| !it.is_space() && !is_line_break(it.ch))) else {
return false;
};
!(start..last).any(|k| {
let (Some(a), Some(b)) = (items.get(k), items.get(k + 1)) else { return false };
crate::breaks::break_between(a.ch, b.ch) || (a.char_end <= b.char_start && word_breaks.get(b.char_start).copied().unwrap_or(false))
})
}
/// How many of `lines` end inside a word: emergency breaks, made where no word boundary fitted
/// the width. Balance and Pretty never add one (a word that fits the box stays whole).
fn emergency_breaks(items: &[Item], word_breaks: &[bool], lines: &[LineRange]) -> usize {
lines
.iter()
.filter(|&&(_, end, para_end, _)| {
if para_end {
return false;
}
let (Some(a), Some(b)) = (end.checked_sub(1).and_then(|k| items.get(k)), items.get(end)) else { return false };
!(a.is_space()
|| is_line_break(a.ch)
|| crate::breaks::break_between(a.ch, b.ch)
|| (a.char_end <= b.char_start && word_breaks.get(b.char_start).copied().unwrap_or(false)))
})
.count()
}
/// What a line's hanging punctuation adds to the room [`break_lines`] gives it (its opening mark
/// at the start, its closing one at the end), so Pretty narrows a line by its text as the breaker
/// measures it.
fn hung_width(items: &[Item], (s, e, _, _): LineRange, hang_start: bool, hang_end: bool, rtl_para_at: &dyn Fn(usize) -> bool) -> f64 {
let ltr = items.get(s).is_none_or(|it| !rtl_para_at(it.char_start));
let first = items.get(s).filter(|it| hang_start && ltr && opens(it.ch)).map_or(0.0, |it| it.adv);
let last = e.checked_sub(1).filter(|k| *k > s).and_then(|k| items.get(k)).filter(|it| hang_end && ltr && closes(it.ch)).map_or(0.0, |it| it.adv);
first + last
}
/// The width of the line's text, its trailing spaces and line break aside, as the breaker
/// measures it.
fn line_width(items: &[Item], (start, end, _, _): LineRange) -> f64 {
let mut x = 0.0;
let mut width = 0.0;
for it in items.get(start..end).unwrap_or(&[]) {
if is_line_break(it.ch) {
break;
}
x += it.adv;
if !it.is_space() {
width = x - it.spacing;
}
}
width
}
/// Balance and Pretty: the greedy `lines` of a box `w` wide, re-broken paragraph by paragraph.
/// Balance narrows a paragraph as far as it goes without another line, so its lines come out
/// close to the same length ("distributes text as evenly as possible across every line, so each
/// line is close to the same length"; what browsers do for `text-wrap: balance`). Pretty leaves
/// lines full but, when the last line is one word, narrows one of the last four lines just enough
/// to give a word to the lines after it ("keeps each line full, but adjusts the last four lines to
/// avoid an orphan"). `rebreak` lays the text out again with a width per paragraph and line.
fn restyle_breaks(
style: WrapStyle,
w: f64,
lines: Vec<LineRange>,
items: &[Item],
word_breaks: &[bool],
line_indent_of: &dyn Fn(usize, bool, usize) -> f64,
hung_of: &dyn Fn(LineRange) -> f64,
rebreak: &dyn Fn(&WidthOf<'_>) -> Vec<LineRange>,
) -> Vec<LineRange> {
let paragraphs = lines.last().map_or(0, |l| l.3 + 1);
// Every pass lays the whole text out again: a very long text keeps its greedy lines.
if items.len().saturating_mul(paragraphs) > 2_000_000 {
return lines;
}
let mut plan = vec![ParaWidth { width: w, line: None }; paragraphs];
// The lines with paragraph `p` wrapped to `pw` and the others as planned.
let with = |plan: &[ParaWidth], p: usize, pw: ParaWidth| {
let width_of = move |q: usize, li: usize| {
let pw = if q == p { pw } else { plan.get(q).copied().unwrap_or(ParaWidth { width: w, line: None }) };
Some(match pw.line {
Some((j, narrow)) if li == j => narrow,
_ => pw.width,
})
};
rebreak(&width_of)
};
let of = |ls: &[LineRange], p: usize| -> Vec<LineRange> { ls.iter().copied().filter(|l| l.3 == p).collect() };
let mut current = lines;
for p in 0..paragraphs {
let para = of(&current, p);
let n = para.len();
if n < 2 {
continue;
}
// Words wider than the box break where they must; the re-breaking adds no such break.
let base = emergency_breaks(items, word_breaks, &para);
match style {
WrapStyle::Auto => {}
WrapStyle::Balance => {
// The narrowest width that still gives `n` lines, to half a pixel.
let (mut lo, mut hi) = (0.0, w);
while hi - lo > 0.5 {
let mid = (lo + hi) / 2.0;
let ls = of(&with(&plan, p, ParaWidth { width: mid, line: None }), p);
if ls.len() == n && emergency_breaks(items, word_breaks, &ls) <= base {
hi = mid;
} else {
lo = mid;
}
}
let pw = ParaWidth { width: hi, line: None };
current = with(&plan, p, pw);
if let Some(slot) = plan.get_mut(p) {
*slot = pw;
}
}
WrapStyle::Pretty => {
if !para.last().is_some_and(|l| single_word(items, word_breaks, *l)) {
continue;
}
// The line before the last, back to the fourth from the end: narrowed to just under
// its text, its last word goes to the lines after it (which stay full); a word or
// two more if the last line is still alone. A line that would rather start another
// line can't give a word away.
'lines: for j in (n.saturating_sub(4)..n - 1).rev() {
let Some(&line) = para.get(j) else { continue };
let indent = line_indent_of(p, j == 0, items.get(line.0).map_or(0, |it| it.char_start));
let mut narrow = line_width(items, line) - hung_of(line);
for _ in 0..3 {
narrow -= 0.5;
if narrow <= 0.0 {
break;
}
let pw = ParaWidth { width: w, line: Some((j, narrow + indent)) };
let ls = with(&plan, p, pw);
let after = of(&ls, p);
if after.len() != n || emergency_breaks(items, word_breaks, &after) > base {
break;
}
if !after.last().is_some_and(|l| single_word(items, word_breaks, *l)) {
current = ls;
if let Some(slot) = plan.get_mut(p) {
*slot = pw;
}
break 'lines;
}
narrow = after.get(j).map_or(0.0, |l| line_width(items, *l) - hung_of(*l));
}
}
}
}
}
current
}
/// Pins a breaking closure to the signature [`wrapped_lines`] takes: a closure whose parameter
/// borrows a trait object is otherwise inferred for one lifetime, not any.
fn breaker<F>(f: F) -> F
where
F: Fn(&WidthOf<'_>, Option<SavedStarts<'_>>) -> Option<Vec<LineRange>>,
{
f
}
/// The lines of a text wrapped to `wrap`: the file's saved breaks while they hold, else greedy
/// ones, re-broken for Balance or Pretty. `breaks` runs [`break_lines`] with a width per line and
/// the saved starts to follow.
fn wrapped_lines(
text: &TextData,
wrap: Option<f64>,
items: &[Item],
word_breaks: &[bool],
line_indent_of: &dyn Fn(usize, bool, usize) -> f64,
hung_of: &dyn Fn(LineRange) -> f64,
breaks: &Breaker<'_>,
) -> Vec<LineRange> {
// Where the file saved its line breaks, they win while the text and box are as saved.
let saved = wrap.and_then(|w| text.saved_breaks_for(w)).map(|starts| SavedStarts { starts, next: 0 });
let from_saved = saved.and_then(|s| breaks(&|_, _| wrap, Some(s)));
let followed = from_saved.is_some();
let lines = from_saved.or_else(|| breaks(&|_, _| wrap, None)).unwrap_or_default();
// Balance and Pretty re-break the paragraphs at narrower widths (never saved breaks).
match wrap {
Some(w) if !followed && text.wrap_style != WrapStyle::Auto => {
restyle_breaks(text.wrap_style, w, lines, items, word_breaks, line_indent_of, hung_of, &|wrap_of| {
breaks(wrap_of, None).unwrap_or_default()
})
}
_ => lines,
}
}
#[derive(Clone, Copy)]
struct LayoutFinish<'a> {
text: &'a TextData,
@@ -798,6 +1017,8 @@ fn truncate_layout(out: &mut TextLayout, finish: &LayoutFinish<'_>) {
}
}
add_ellipsis(out, wrap);
// The ellipsis can make the last line the widest: an auto-width box hugs it too.
out.width = out.width.max(out.lines.last().map_or(0.0, |l| l.width));
// Carets and selections reach every char the line shows, borrowed ones included.
if let Some(l) = out.lines.last() {
let shown =
@@ -951,10 +1172,12 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
// The start indent of a line of paragraph `p` (`first`: its first line, starting at char `ci`).
let line_indent_of = |p: usize, first: bool, ci: usize| {
let pl = list_of(p);
let level = step * (f64::from(pl.indent) + 1.0) - hang_list;
match pl.list {
ListStyle::None if first => indent_at(ci),
ListStyle::None => 0.0,
_ => step * (f64::from(pl.indent) + 1.0) - hang_list,
// A plain paragraph that kept its level on leaving a list starts where that level's
// item text does; paragraph indent goes on its first line as on any plain paragraph.
ListStyle::None => (if pl.indent > 0 { level } else { 0.0 }) + if first { indent_at(ci) } else { 0.0 },
_ => level,
}
};
// Hanging punctuation: at the start edge of left-aligned and justified lines, at the end edge
@@ -966,10 +1189,11 @@ pub fn layout(text: &TextData, box_width: Option<f64>, box_height: Option<f64>)
TextAutoResize::WidthAndHeight => None,
_ => box_width.filter(|w| w.is_finite() && *w > 0.0),
};
let breaks = |saved| break_lines(&items, &chars, &cluster_start, &word_breaks, wrap, &line_indent_of, &rtl_para_at, hang_start, hang_end, saved);
// Where the file saved its line breaks, they win while the text and box are as saved.
let saved = wrap.and_then(|w| text.saved_breaks_for(w)).map(|starts| SavedStarts { starts, next: 0 });
let lines = saved.and_then(|s| breaks(Some(s))).or_else(|| breaks(None)).unwrap_or_default();
let breaks = breaker(|wrap_of, saved| {
break_lines(&items, &chars, &cluster_start, &word_breaks, wrap_of, &line_indent_of, &rtl_para_at, hang_start, hang_end, saved)
});
let hung_of = |l: LineRange| hung_width(&items, l, hang_start, hang_end, &rtl_para_at);
let lines = wrapped_lines(text, wrap, &items, &word_breaks, &line_indent_of, &hung_of, &breaks);
// Line metrics and positions.
let default_style = styles.first().cloned().unwrap_or_default();
let default_face = faces.first().cloned().flatten();
@@ -1237,9 +1461,9 @@ fn roman(mut n: usize) -> String {
}
/// The width of one list level's gutter: room for the widest number plus half an em, at least one
/// and a half ems (0 without lists).
/// and a half ems (0 without lists, or plain paragraphs that kept a list level).
fn list_step(lists: &[ParaList], markers: &[String], style: Option<&TextStyle>, face: Option<&Arc<Face>>) -> f64 {
if lists.iter().all(|l| l.list == ListStyle::None) {
if lists.iter().all(|l| l.list == ListStyle::None && l.indent == 0) {
return 0.0;
}
let size = style.map(|s| sanitize_size(s.font_size)).unwrap_or(12.0);
@@ -1414,48 +1638,85 @@ fn shape_segment(chars: &[char], seg: &Segment, face: &Arc<Face>, features: &[Fe
// Variable fonts: the axis values the style asks for (named instance, implied weight, custom).
let values = face.axis_values(style);
let coords = face.coords(&values);
let mut raw: Vec<(u32, u32, i32, i32, i32)> = Vec::new();
if let Some(hb) = face.hb() {
let instance = (!coords.is_empty()).then(|| {
let vars = face
.axes
.iter()
.zip(&values)
.filter_map(|(a, v)| <[u8; 4]>::try_from(a.tag.as_bytes()).ok().map(|t| Variation { tag: Tag::new(&t), value: *v as f32 }));
ShaperInstance::from_variations(&hb, vars)
});
let shaper = face.shaper.shaper(&hb).instance(instance.as_ref()).build();
let mut buf = UnicodeBuffer::new();
for (u, src, _) in &mapped {
buf.add(*u, *src as u32);
let shape = |feats: &[Feature]| -> Vec<(u32, u32, i32, i32, i32)> {
let mut raw = Vec::new();
if let Some(hb) = face.hb() {
let instance = (!coords.is_empty()).then(|| {
let vars = face
.axes
.iter()
.zip(&values)
.filter_map(|(a, v)| <[u8; 4]>::try_from(a.tag.as_bytes()).ok().map(|t| Variation { tag: Tag::new(&t), value: *v as f32 }));
ShaperInstance::from_variations(&hb, vars)
});
let shaper = face.shaper.shaper(&hb).instance(instance.as_ref()).build();
let mut buf = UnicodeBuffer::new();
for (u, src, _) in &mapped {
buf.add(*u, *src as u32);
}
let rtl = seg.level % 2 == 1;
buf.set_direction(if rtl { Direction::RightToLeft } else { Direction::LeftToRight });
buf.guess_segment_properties();
let gb = shaper.shape(buf, ShapeOptions::new().features(feats));
for (info, pos) in gb.glyph_infos().iter().zip(gb.glyph_positions()) {
raw.push((info.glyph_id, info.cluster, pos.x_advance, pos.x_offset, pos.y_offset));
}
// Right-to-left glyphs come out in visual order; items are kept in logical order
// (lines put runs back in visual order).
if rtl {
raw.reverse();
}
} else {
for (u, src, _) in &mapped {
let gid = face.glyph_for(*u);
raw.push((gid, *src as u32, face.advance_at(gid, &coords) as i32, 0, 0));
}
}
let rtl = seg.level % 2 == 1;
buf.set_direction(if rtl { Direction::RightToLeft } else { Direction::LeftToRight });
buf.guess_segment_properties();
let gb = shaper.shape(buf, ShapeOptions::new().features(&feats));
for (info, pos) in gb.glyph_infos().iter().zip(gb.glyph_positions()) {
raw.push((info.glyph_id, info.cluster, pos.x_advance, pos.x_offset, pos.y_offset));
}
// Right-to-left glyphs come out in visual order; items are kept in logical order (lines
// put runs back in visual order).
if rtl {
raw.reverse();
}
} else {
for (u, src, _) in &mapped {
let gid = face.glyph_for(*u);
raw.push((gid, *src as u32, face.advance_at(gid, &coords) as i32, 0, 0));
raw
};
let mut raw = shape(&feats);
// Superscript or subscript (`sups` / `subs` on the node): the face's own glyphs where it has
// the feature and every letter or digit here got one; otherwise synthesised from the standard
// glyphs, shrunk and shifted ("Figma draws a synthesized version by using the font's standard
// version of the character, shrinking it, and positioning it accordingly"; a run mixing
// available and unavailable glyphs is synthesised whole, "for consistency").
let script = [(b"sups", true), (b"subs", false)].into_iter().find(|(tag, _)| feats.iter().any(|f| f.tag == Tag::new(tag) && f.value != 0));
// The glyph a cluster's character has on its own, after the case mapping shaping saw.
let plain_gid = |cl: usize| mapped.iter().find(|(_, src, _)| *src == cl).map(|(u, _, _)| face.glyph_for(*u));
let unchanged = |raw: &[(u32, u32, i32, i32, i32)]| {
raw.iter().any(|&(gid, cl, ..)| {
let cl = cl as usize;
chars.get(cl).is_some_and(|c| c.is_alphanumeric()) && plain_gid(cl) == Some(gid)
})
};
let synth = script.filter(|(tag, _)| !face.has_feature(tag) || unchanged(&raw));
if let Some((tag, _)) = synth
&& face.has_feature(tag)
{
let plain: Vec<Feature> = feats.iter().filter(|f| f.tag != Tag::new(tag)).cloned().collect();
raw = shape(&plain);
}
let (script_scale, script_shift) = synth.map_or((1.0, 0.0), |(_, up)| if up { face.superscript } else { face.subscript });
let n = raw.len();
// Cluster end: the next larger cluster value, else the segment end. A glyph in the same
// cluster as the next one shares its end, so many glyphs of one cluster aren't rescanned.
let mut cends = vec![0usize; n];
for gi in (0..n).rev() {
let Some(&(_, cl, ..)) = raw.get(gi) else { continue };
let cl = cl as usize;
let shared = raw.get(gi + 1).filter(|r| r.1 as usize == cl).and_then(|_| cends.get(gi + 1).copied());
let cend = shared.unwrap_or_else(|| raw.iter().skip(gi + 1).map(|r| r.1 as usize).find(|c| *c > cl).unwrap_or(end).max(cl + 1));
if let Some(slot) = cends.get_mut(gi) {
*slot = cend;
}
}
let n = raw.len();
for gi in 0..n {
let Some(&(gid, cl, xa, xo, yo)) = raw.get(gi) else { continue };
let cl = cl as usize;
// Cluster end: the next larger cluster value, else the segment end.
let cend = raw.iter().skip(gi + 1).map(|r| r.1 as usize).find(|c| *c > cl).unwrap_or(end).max(cl + 1);
let cend = cends.get(gi).copied().unwrap_or(cl + 1);
let last_in_cluster = raw.get(gi + 1).is_none_or(|r| r.1 as usize != cl);
let ch = chars.get(cl).copied().unwrap_or(' ');
let scale = if small_at(cl) { SMALL_CAP_SCALE } else { 1.0 };
let scale = if small_at(cl) { SMALL_CAP_SCALE } else { 1.0 } * script_scale;
let spacing = if last_in_cluster { seg.spacing * (cend - cl) as f64 } else { 0.0 };
// The glyph's own advance and what shaping added to it (kerning) each land on the grid.
let own = face.advance_at(gid, &coords);
@@ -1468,7 +1729,7 @@ fn shape_segment(chars: &[char], seg: &Segment, face: &Arc<Face>, features: &[Fe
adv,
spacing,
dx: f64::from(xo) * k * scale,
dy: f64::from(yo) * k * scale,
dy: f64::from(yo) * k * scale + script_shift * k,
char_start: cl,
char_end: cend,
style: seg.st_idx,
crates/text/src/tests.rs
+43
View File
@@ -157,6 +157,49 @@ fn small_caps_native_or_synthesised() {
assert_eq!(sc.glyphs.iter().find(|g| g.char_start == 0).unwrap().gid, face.glyph_for('A'));
}
#[test]
fn superscript_native_or_synthesised_and_never_mixed() {
// "Figma tries to use any superscript/subscript glyphs provided by the font. If it isn't
// provided, Figma draws a synthesized version by using the font's standard version of the
// character, shrinking it, and positioning it accordingly." and a layer mixing both "will all
// update to the synthesized form for consistency" (Explore text properties).
let Some(face) = inter() else { return };
let mut t = TextData::new("x2");
t.style.font_size = 20.0;
let plain = layout(&t, None, None);
t.features.insert("sups".into(), true);
let sup = layout(&t, None, None);
let at = |l: &TextLayout, i: usize| l.glyphs.iter().find(|g| g.char_start == i).cloned().unwrap();
let native = |i: usize| at(&sup, i).gid != at(&plain, i).gid && (at(&sup, i).size - 20.0).abs() < 1e-9;
let synthesised = |i: usize| at(&sup, i).gid == at(&plain, i).gid && at(&sup, i).size < 20.0 && at(&sup, i).y < at(&plain, i).y;
assert!((native(0) && native(1)) || (synthesised(0) && synthesised(1)), "both glyphs the same way: {:?} {:?}", at(&sup, 0), at(&sup, 1));
if !face.has_feature(b"sups") {
assert!(synthesised(0) && synthesised(1), "no sups in the face: synthesised");
}
t.features.insert("sups".into(), false);
t.features.insert("subs".into(), true);
let sub = layout(&t, None, None);
let g = at(&sub, 1);
let p = at(&plain, 1);
assert!((g.gid != p.gid && (g.size - 20.0).abs() < 1e-9) || (g.size < 20.0 && g.y > p.y), "subscript: native, or shrunk and lowered: {g:?}");
// Capitalised, the same holds: the check against the face's own glyphs sees the characters
// shaping saw (an X, not an x), so a face with a superscript 2 and no superscript X
// synthesises both rather than mixing them.
t.features.clear();
t.style.case = figcraft_doc::TextCase::Upper;
let plain_up = layout(&t, None, None);
t.features.insert("sups".into(), true);
let up = layout(&t, None, None);
let native_up = |i: usize| at(&up, i).gid != at(&plain_up, i).gid && (at(&up, i).size - 20.0).abs() < 1e-9;
let synth_up = |i: usize| at(&up, i).gid == at(&plain_up, i).gid && at(&up, i).size < 20.0 && at(&up, i).y < at(&plain_up, i).y;
assert!(
(native_up(0) && native_up(1)) || (synth_up(0) && synth_up(1)),
"upper case: both glyphs the same way: {:?} {:?}",
at(&up, 0),
at(&up, 1)
);
}
#[test]
fn title_case_across_runs() {
let Some(face) = inter() else { return };
crates/ui-egui/locales/ar.toml
-1
View File
@@ -288,7 +288,6 @@ status = "draft — needs native review"
"Code" = "الكود"
"Code syntax" = "صياغة الكود"
"Collapse" = "طي"
"Collapse panel" = "طي اللوحة"
"Collection" = "مجموعة"
"Collections" = "المجموعات"
"Color" = "اللون"
crates/ui-egui/locales/bn.toml
-1
View File
@@ -275,7 +275,6 @@ status = "draft — needs native review"
"Code" = "কোড"
"Code syntax" = "কোড সিনট্যাক্স"
"Collapse" = "সংকুচিত করুন"
"Collapse panel" = "প্যানেল সংকুচিত করুন"
"Collection" = "সংগ্রহ"
"Collections" = "সংগ্রহসমূহ"
"Color" = "রঙ"
crates/ui-egui/locales/bs.toml
-1
View File
@@ -288,7 +288,6 @@ status = "draft — needs native review"
"Code" = "Kod"
"Code syntax" = "Sintaksa koda"
"Collapse" = "Skupi"
"Collapse panel" = "Skupi panel"
"Collection" = "Kolekcija"
"Collections" = "Kolekcije"
"Color" = "Boja"
crates/ui-egui/locales/cs.toml
-1
View File
@@ -265,7 +265,6 @@ status = "draft — needs native review"
"Code" = "Kód"
"Code syntax" = "Syntaxe kódu"
"Collapse" = "Sbalit"
"Collapse panel" = "Sbalit panel"
"Collection" = "Kolekce"
"Collections" = "Kolekce"
"Color" = "Barva"
crates/ui-egui/locales/de.toml
+192 -1
View File
@@ -263,7 +263,6 @@ status = "draft — needs native review"
"Code" = "Code"
"Code syntax" = "Code-Syntax"
"Collapse" = "Einklappen"
"Collapse panel" = "Bereich einklappen"
"Collection" = "Sammlung"
"Collections" = "Sammlungen"
"Color" = "Farbe"
@@ -1781,6 +1780,198 @@ status = "draft — needs native review"
"⌘ click" = "⌘ Klick"
"⌘ scroll" = "⌘ Scrollen"
"⌥ drag" = "⌥ Ziehen"
"1 year" = "1 Jahr"
"30 days" = "30 Tage"
"90 days" = "90 Tage"
"A responsive product page: hero, features, figures, a quote and a footer" = "Eine responsive Produktseite: Hero-Bereich, Funktionen, Kennzahlen, ein Zitat und eine Fußzeile"
"A title, an agenda, a big figure, a chart and a closing slide" = "Ein Titel, eine Agenda, eine große Kennzahl, ein Diagramm und eine Abschlussfolie"
"A to Z" = "A bis Z"
"All the fonts this file uses are installed" = "Alle Schriften dieser Datei sind installiert"
"Allow and download" = "Erlauben und herunterladen"
"Allow downloading fonts?" = "Herunterladen von Schriften erlauben?"
"Alphabetical" = "Alphabetisch"
"An analytics screen on a grid: figures, charts drawn from vectors and a table" = "Ein Analytics-Bildschirm auf einem Raster: Kennzahlen, aus Vektoren gezeichnete Diagramme und eine Tabelle"
"Android Vector Drawable" = "Android Vector Drawable"
"Apps" = "Apps"
"Apr" = "Apr."
"Aug" = "Aug."
"Best effort" = "Bestmöglich"
"Board grid" = "Boardraster"
"Bottom padding" = "Innenabstand unten"
"Bound to {name}. Click to detach the variable." = "An {name} gebunden. Klicken Sie, um die Variable zu lösen."
"Check for Updates" = "Nach Updates suchen"
"Check for updates…" = "Nach Updates suchen…"
"Checking the fonts installed on this computer…" = "Auf diesem Computer installierte Schriften werden geprüft…"
"Colour and text styles, Light and Dark variables, buttons, inputs and cards" = "Farb- und Textstile, Variablen für Hell und Dunkel, Buttons, Eingabefelder und Karten"
"Compatibility" = "Kompatibilität"
"Convert to frame" = "In Rahmen umwandeln"
"Convert to section" = "In Abschnitt umwandeln"
"Dart constants for Flutter…" = "Dart-Konstanten für Flutter…"
"Calculated from other variables; it follows them" = "Aus anderen Variablen berechnet; folgt ihnen"
"Copied comments for AI" = "Kommentare für KI kopiert"
"Copy effect" = "Effekt kopieren"
"Copy fill" = "Füllung kopieren"
"Copy for AI" = "Für KI kopieren"
"Copy stroke" = "Kontur kopieren"
"Couldn't download {name}" = "{name} konnte nicht heruntergeladen werden"
"Created" = "Erstellt"
"Crop image" = "Bild zuschneiden"
"Dashboard" = "Dashboard"
"Date created" = "Erstellungsdatum"
"Dec" = "Dez."
"Design system starter" = "Designsystem-Starter"
"Detach calculation" = "Berechnung lösen"
"Don't show this again" = "Nicht mehr anzeigen"
"Download" = "Herunterladen"
"Downloading… {percent}%" = "Wird heruntergeladen… {percent} %"
"Draw a frame" = "Rahmen zeichnen"
"Drop to use this image" = "Loslassen, um dieses Bild zu verwenden"
"Edited {when}" = "Bearbeitet {when}"
"Exact only" = "Nur exakt"
"Export frames and layers as PNG, JPG, SVG or PDF" = "Rahmen und Ebenen als PNG, JPG, SVG oder PDF exportieren"
"Exported {name}; {n} kinds of content were changed or left out" = { one = "{name} exportiert; {n} Inhaltsart wurde geändert oder ausgelassen", other = "{name} exportiert; {n} Inhaltsarten wurden geändert oder ausgelassen" }
"Exported {n} files; some content was changed or left out" = { one = "{n} Datei exportiert; einige Inhalte wurden geändert oder ausgelassen", other = "{n} Dateien exportiert; einige Inhalte wurden geändert oder ausgelassen" }
"Feb" = "Feb."
"FigCraft stopped because of an internal error." = "FigCraft wurde wegen eines internen Fehlers beendet."
"File not found" = "Datei nicht gefunden"
"Format" = "Format"
"Four screens of a trail app with components and a prototype flow" = "Vier Bildschirme einer Wander-App mit Komponenten und einem Prototyp-Ablauf"
"Free fonts come from Google Fonts and Noto, through jsDelivr and GitHub. Each file is checked against the font index before it is installed into the font folder the Craft apps share. Nothing is downloaded until you allow it." = "Kostenlose Schriften stammen von Google Fonts und Noto und werden über jsDelivr und GitHub geladen. Jede Datei wird anhand des Schriftenindex geprüft, bevor sie in den Schriftenordner installiert wird, den die Craft-Apps gemeinsam nutzen. Nichts wird heruntergeladen, bevor Sie es erlauben."
"Getting started" = "Erste Schritte"
"Graph paper" = "Rasterpapier"
"Greyscale components and two example screens to sketch a flow with" = "Komponenten in Graustufen und zwei Beispielbildschirme, um einen Ablauf zu skizzieren"
"Hide UI" = "Oberfläche ausblenden"
"Hide these tips (Getting started in the Help menu shows them again)" = "Diese Tipps ausblenden („Erste Schritte“ im Hilfemenü zeigt sie wieder an)"
"Hide when publishing" = "Beim Veröffentlichen ausblenden"
"Icon components on a 24 px grid with keylines and a size preview" = "Icon-Komponenten auf einem 24-px-Raster mit Keylines und einer Größenvorschau"
"Icon set starter" = "Icon-Set-Starter"
"Ignore unsupported" = "Nicht unterstützte ignorieren"
"Individual padding" = "Einzelne Innenabstände"
"Interface size" = "Größe der Oberfläche"
"Jan" = "Jan."
"Joining live session…" = "Live-Sitzung wird beigetreten…"
"Jul" = "Jul."
"Jun" = "Jun."
"Kits" = "Kits"
"Landing page" = "Landingpage"
"Last modified" = "Zuletzt geändert"
"Leaving the prototype" = "Prototyp wird verlassen"
"Left padding" = "Innenabstand links"
"Link frames on the Prototype tab, then present the flow" = "Verknüpfen Sie Rahmen im Tab „Prototyp“ und präsentieren Sie dann den Ablauf"
"Make a component" = "Komponente erstellen"
"Past 30 days" = "Letzte 30 Tage"
"Past 90 days" = "Letzte 90 Tage"
"Past year" = "Letztes Jahr"
"Mar" = "Mär."
"May" = "Mai"
"Missing fonts" = "Fehlende Schriften"
"Mobile app" = "Mobile App"
"Newest first" = "Neueste zuerst"
"No comments to copy" = "Keine Kommentare zum Kopieren"
"No files or templates match your search" = "Keine Dateien oder Vorlagen passen zu Ihrer Suche"
"No other pages" = "Keine weiteren Seiten"
"No templates match your search" = "Keine Vorlagen passen zu Ihrer Suche"
"Not now" = "Nicht jetzt"
"Nothing counted yet" = "Noch nichts gezählt"
"Nov" = "Nov."
"Rotate a degree (Shift: 15)" = "Um ein Grad drehen (Umschalt: 15)"
"⌥⌘ ← ↑ → ↓" = "⌥⌘ ← ↑ → ↓"
"Ctrl+Alt+← ↑ → ↓" = "Strg+Alt+← ↑ → ↓"
"Oct" = "Okt."
"Oldest first" = "Älteste zuerst"
"One announcement in five common sizes: square, portrait, story, link and banner" = "Eine Ankündigung in fünf gängigen Größen: Quadrat, Hochformat, Story, Link und Banner"
"Order" = "Reihenfolge"
"Other" = "Sonstige"
"Paste effect" = "Effekt einfügen"
"Paste fill" = "Füllung einfügen"
"Paste stroke" = "Kontur einfügen"
"Pick the Frame tool, then drag on the canvas or choose a device size" = "Wählen Sie das Rahmen-Werkzeug und ziehen Sie auf der Arbeitsfläche oder wählen Sie eine Gerätegröße"
"Plugin" = "Plugin"
"Plugins & widgets" = "Plugins & Widgets"
"Presentation slides" = "Präsentationsfolien"
"Playground" = "Testumgebung"
"Relative to your system's display scaling (100% is the system's own size). Document zoom is separate." = "Relativ zur Anzeigeskalierung Ihres Systems (100 % ist die Größe des Systems). Der Dokumentzoom ist davon unabhängig."
"Reload the page to get back the unsaved files the browser had room for." = "Laden Sie die Seite neu, um die ungespeicherten Dateien zurückzuerhalten, für die der Browser Platz hatte."
"Reload the page to get your unsaved files back." = "Laden Sie die Seite neu, um Ihre ungespeicherten Dateien zurückzuerhalten."
"Reload the page to start again." = "Laden Sie die Seite neu, um von vorn zu beginnen."
"Remove all auto layout" = "Gesamtes Auto-Layout entfernen"
"Remove from recents" = "Aus „Zuletzt verwendet“ entfernen"
"Reorder selection" = "Auswahl neu anordnen"
"Reset grid" = "Raster zurücksetzen"
"Right padding" = "Innenabstand rechts"
"Search templates" = "Vorlagen suchen"
"See all templates" = "Alle Vorlagen ansehen"
"Select layers and they space themselves as their content changes" = "Wählen Sie Ebenen aus, und ihre Abstände passen sich an, wenn sich der Inhalt ändert"
"Search files and templates" = "Dateien und Vorlagen suchen"
"Search results" = "Suchergebnisse"
"This server doesn't count insertions" = "Dieser Server zählt keine Einfügungen"
"This server doesn't count styles and variables" = "Dieser Server zählt keine Stile und Variablen"
"Upload from computer" = "Vom Computer hochladen"
"Search pages" = "Seiten suchen"
"Sep" = "Sep."
"Server key" = "Serverschlüssel"
"Set corner smoothing to 60%" = "Eckenglättung auf 60 % setzen"
"Share with a code" = "Mit einem Code teilen"
"Show all templates" = "Alle Vorlagen anzeigen"
"The bars are hidden. {shortcut} shows them again" = "Die Leisten sind ausgeblendet. {shortcut} blendet sie wieder ein"
"Show in Explorer" = "Im Explorer anzeigen"
"Show in Finder" = "Im Finder anzeigen"
"Show in folder" = "Im Ordner anzeigen"
"Social and slides" = "Social Media und Folien"
"Social post sizes" = "Größen für Social-Media-Beiträge"
"Sort by" = "Sortieren nach"
"Sort by {column}" = "Nach {column} sortieren"
"Start from a template" = "Mit einer Vorlage beginnen"
"Start sharing with the Share button, then pass on the code it gives" = "Starten Sie das Teilen mit der Schaltfläche „Teilen“ und geben Sie dann den angezeigten Code weiter"
"Strong line every" = "Starke Linie alle"
"Text on a path" = "Text auf Pfad"
"The window is too small for {size}%, so the interface is drawn at {drawn}%. Make the window larger to use {size}%." = "Das Fenster ist zu klein für {size} %, daher wird die Oberfläche mit {drawn} % dargestellt. Vergrößern Sie das Fenster, um {size} % zu verwenden."
"This file is too large to join here (up to {mb} MB)" = "Diese Datei ist zu groß, um hier beizutreten (bis zu {mb} MB)"
"This file uses fonts that aren't installed on this computer. Their text is drawn in a fallback font until you install them." = "Diese Datei verwendet Schriften, die auf diesem Computer nicht installiert sind. Ihr Text wird in einer Ersatzschrift dargestellt, bis Sie sie installieren."
"This link opens a website outside the prototype:" = "Dieser Link öffnet eine Website außerhalb des Prototyps:"
"This link opens your mail app to write a message:" = "Dieser Link öffnet Ihre Mail-App, um eine Nachricht zu schreiben:"
"This server doesn't count detached instances" = "Dieser Server zählt keine gelösten Instanzen"
"Top padding" = "Innenabstand oben"
"Try another search, or browse templates." = "Versuchen Sie eine andere Suche oder stöbern Sie in den Vorlagen."
"Try another word, or look at every kind." = "Versuchen Sie ein anderes Wort oder sehen Sie sich alle Arten an."
"Turn a layer into a component, reuse it, and change every copy at once" = "Wandeln Sie eine Ebene in eine Komponente um, verwenden Sie sie wieder und ändern Sie alle Kopien auf einmal"
"Update check is not supported in the web browser." = "Die Update-Suche wird im Webbrowser nicht unterstützt."
"Use your browser's zoom to change the interface size." = "Ändern Sie die Größe der Oberfläche mit dem Zoom Ihres Browsers."
"Uses variables: each layer shows them in its own mode" = "Verwendet Variablen: Jede Ebene zeigt sie in ihrem eigenen Modus"
"Websites" = "Websites"
"What you try here changes this preview and the code below, not the file" = "Was Sie hier ausprobieren, ändert diese Vorschau und den Code darunter, nicht die Datei"
"Widget" = "Widget"
"Wireframe kit" = "Wireframe-Kit"
"Your unsaved files were too large for the browser to keep." = "Ihre ungespeicherten Dateien waren zu groß, als dass der Browser sie behalten konnte."
"Z to A" = "Z bis A"
"connector labels without a saved snapshot are centred on the line, without their background" = "Verbinder-Beschriftungen ohne gespeicherten Schnappschuss werden mittig auf der Linie und ohne Hintergrund dargestellt"
"elbowed and curved connectors without a saved path follow FigCraft's own routing" = "Abgewinkelte und gebogene Verbinder ohne gespeicherten Pfad folgen dem eigenen Routing von FigCraft"
"instance swap properties whose default component was past the layer limit were skipped" = "Instanztausch-Eigenschaften, deren Standardkomponente über dem Ebenenlimit lag, wurden übersprungen"
"instances whose component was past the layer limit were imported as frames" = "Instanzen, deren Komponente über dem Ebenenlimit lag, wurden als Rahmen importiert"
"invalid vector region fill paint list; layer fill used" = "Ungültige Füllungsliste der Vektorregion; Füllung der Ebene verwendet"
"invalid vector region paints were skipped" = "Ungültige Füllungen der Vektorregion wurden übersprungen"
"just now" = "gerade eben"
"linked vector region fill styles keep resolved appearance; live style links were left out" = "Verknüpfte Füllstile von Vektorregionen behalten ihr aufgelöstes Aussehen; Live-Stilverknüpfungen wurden ausgelassen"
"note or shape generated child has invalid bounds; child skipped" = "Vom Notiz- oder Formgenerator erzeugtes Kindobjekt hat ungültige Grenzen; Kindobjekt übersprungen"
"note or shape generated child is missing its style or bounds; child skipped" = "Dem vom Notiz- oder Formgenerator erzeugten Kindobjekt fehlen Stil oder Grenzen; Kindobjekt übersprungen"
"note or shape generated children exceed the layer or nesting limit; remaining children skipped" = "Vom Notiz- oder Formgenerator erzeugte Kindobjekte überschreiten das Ebenen- oder Verschachtelungslimit; übrige Kindobjekte übersprungen"
"note or shape generated layout is missing or unsupported; using its outer frame" = "Das vom Notiz- oder Formgenerator erzeugte Layout fehlt oder wird nicht unterstützt; äußerer Rahmen verwendet"
"only in a text style or variable" = "nur in einem Textstil oder einer Variable"
"shape generated outline is missing or damaged; using its rectangle" = "Die vom Formgenerator erzeugte Kontur fehlt oder ist beschädigt; Rechteck verwendet"
"slot layers without a matching slot property were imported as frames" = "Slot-Ebenen ohne passende Slot-Eigenschaft wurden als Rahmen importiert"
"variable-bound vector region paints keep resolved appearance; live bindings were left out" = "An Variablen gebundene Füllungen von Vektorregionen behalten ihr aufgelöstes Aussehen; Live-Bindungen wurden ausgelassen"
"vector region paint data exceeded import limits and was skipped" = "Füllungsdaten der Vektorregion überschritten die Importgrenzen und wurden übersprungen"
"vector region references a missing fill style; layer fill used" = "Vektorregion verweist auf einen fehlenden Füllstil; Füllung der Ebene verwendet"
"yesterday" = "gestern"
"{insertions} · {detachments}" = "{insertions} · {detachments}"
"{month} {day}, {year}" = "{day}. {month} {year}"
"{n} detached" = { one = "{n} gelöst", other = "{n} gelöst" }
"{n} inserted" = { one = "{n} eingefügt", other = "{n} eingefügt" }
"{n} text layers" = { one = "{n} Textebene", other = "{n} Textebenen" }
"{percent}%" = "{percent} %"
"{period}: {counts}" = "{period}: {counts}"
"{used} · {detached}" = "{used} · {detached}"
"{used} · {inserted}" = "{used} · {inserted}"
[commands]
"align.bottom" = "Unten ausrichten"
crates/ui-egui/locales/en.toml
+12 -1
View File
@@ -293,7 +293,6 @@ name = "English"
"Code" = "Code"
"Code syntax" = "Code syntax"
"Collapse" = "Collapse"
"Collapse panel" = "Collapse panel"
"Collection" = "Collection"
"Collections" = "Collections"
"Color" = "Color"
@@ -407,6 +406,17 @@ name = "English"
"Decoration style" = "Decoration style"
"Decoration" = "Decoration"
"Deep select" = "Deep select"
"Wrap style" = "Wrap style"
"Balance" = "Balance"
"Pretty" = "Pretty"
"Auto: as many words as fit on each line" = "Auto: as many words as fit on each line"
"Balance: every line close to the same length" = "Balance: every line close to the same length"
"Pretty: full lines, no one word alone on the last" = "Pretty: full lines, no one word alone on the last"
"Set hug contents" = "Set hug contents"
"Set fill container" = "Set fill container"
"Double-click an edge of an auto layout frame" = "Double-click an edge of an auto layout frame"
"⌥ double-click an edge of an auto layout child" = "⌥ double-click an edge of an auto layout child"
"Alt+double-click an edge of an auto layout child" = "Alt+double-click an edge of an auto layout child"
"Default" = "Default"
"Default content" = "Default content"
"Default value (the top-left variant)" = "Default value (the top-left variant)"
@@ -531,6 +541,7 @@ name = "English"
"Exclusion" = "Exclusion"
"Exit focus view (Esc)" = "Exit focus view (Esc)"
"Expand" = "Expand"
"Expand the interface" = "Expand the interface"
"Export" = "Export"
"Export all" = "Export all"
"Export frames and layers as PNG, JPG, SVG or PDF" = "Export frames and layers as PNG, JPG, SVG or PDF"
crates/ui-egui/locales/es.toml
-1
View File
@@ -293,7 +293,6 @@ status = "draft — needs native review"
"Code" = "Código"
"Code syntax" = "Sintaxis de código"
"Collapse" = "Contraer"
"Collapse panel" = "Contraer panel"
"Collection" = "Colección"
"Collections" = "Colecciones"
"Color" = "Color"
crates/ui-egui/locales/fi.toml
-1
View File
@@ -281,7 +281,6 @@ status = "draft — needs native review"
"Code or invite link" = "Koodi tai kutsulinkki"
"Code syntax" = "Koodin syntaksi"
"Collapse" = "Tiivistä muunnokset"
"Collapse panel" = "Supista paneeli"
"Collection" = "Kokoelma"
"Collections" = "Kokoelmat"
"Color" = "Väri"
crates/ui-egui/locales/fr.toml
-1
View File
@@ -269,7 +269,6 @@ status = "draft — needs native review"
"Code" = "Code"
"Code syntax" = "Syntaxe du code"
"Collapse" = "Réduire"
"Collapse panel" = "Réduire le panneau"
"Collection" = "Collection"
"Collections" = "Collections"
"Color" = "Couleur"
crates/ui-egui/locales/id.toml
-1
View File
@@ -281,7 +281,6 @@ status = "draft — needs native review"
"Code" = "Kode"
"Code syntax" = "Sintaks kode"
"Collapse" = "Ciutkan"
"Collapse panel" = "Ciutkan panel"
"Collection" = "Koleksi"
"Collections" = "Koleksi"
"Color" = "Warna"
crates/ui-egui/locales/it.toml
-1
View File
@@ -259,7 +259,6 @@ status = "draft — needs native review"
"Code" = "Codice"
"Code syntax" = "Sintassi del codice"
"Collapse" = "Comprimi"
"Collapse panel" = "Comprimi pannello"
"Collection" = "Collezione"
"Collections" = "Collezioni"
"Color" = "Colore"
crates/ui-egui/locales/ja.toml
-1
View File
@@ -270,7 +270,6 @@ status = "draft — needs native review"
"Code" = "コード"
"Code syntax" = "コード構文"
"Collapse" = "折りたたむ"
"Collapse panel" = "パネルを折りたたむ"
"Collection" = "コレクション"
"Collections" = "コレクション"
"Color" = "カラー"
crates/ui-egui/locales/ka.toml
-1
View File
@@ -279,7 +279,6 @@ status = "draft — reviewed by a native speaker, awaiting a maintainer's approv
"Code" = "კოდი"
"Code syntax" = "კოდის სინტაქსი"
"Collapse" = "ჩაკეცვა"
"Collapse panel" = "პანელის ჩაკეცვა"
"Collection" = "კოლექცია"
"Collections" = "კოლექციები"
"Color" = "ფერი"
crates/ui-egui/locales/ko.toml
-1
View File
@@ -260,7 +260,6 @@ status = "draft — needs native review"
"Code" = "코드"
"Code syntax" = "코드 구문"
"Collapse" = "접기"
"Collapse panel" = "패널 접기"
"Collection" = "컬렉션"
"Collections" = "컬렉션"
"Color" = "색상"
crates/ui-egui/locales/nl.toml
-1
View File
@@ -271,7 +271,6 @@ status = "draft — needs native review"
"Code or invite link" = "Code of uitnodigingslink"
"Code syntax" = "Code-syntaxis"
"Collapse" = "Inklappen"
"Collapse panel" = "Paneel samenvouwen"
"Collection" = "Verzameling"
"Collections" = "Verzamelingen"
"Color" = "Kleur"
crates/ui-egui/locales/pl.toml
-1
View File
@@ -275,7 +275,6 @@ name = "Polski"
"Code" = "Kod"
"Code syntax" = "Składnia kodu"
"Collapse" = "Zwiń"
"Collapse panel" = "Zwiń panel"
"Collection" = "Kolekcja"
"Collections" = "Kolekcje"
"Color" = "Kolor"
crates/ui-egui/locales/pt-BR.toml
-1
View File
@@ -258,7 +258,6 @@ status = "draft — needs native review"
"Code" = "Código"
"Code syntax" = "Sintaxe de código"
"Collapse" = "Recolher"
"Collapse panel" = "Recolher painel"
"Collection" = "Coleção"
"Collections" = "Coleções"
"Color" = "Cor"
crates/ui-egui/locales/ru.toml
-1
View File
@@ -272,7 +272,6 @@ name = "Русский"
"Code" = "Код"
"Code syntax" = "Синтаксис кода"
"Collapse" = "Свернуть"
"Collapse panel" = "Свернуть панель"
"Collection" = "Коллекция"
"Collections" = "Коллекции"
"Color" = "Цвет"
crates/ui-egui/locales/sv.toml
+21 -1
View File
@@ -13,7 +13,10 @@ name = "Svenska"
"({n} warnings: some entries were skipped)" = { one = "({n} varning: vissa poster hoppades över)", other = "({n} varningar: vissa poster hoppades över)" }
"+ Create variable" = "+ Skapa variabel"
".fig (experimental)" = ".fig (experimentell)"
"1 year" = "1 år"
"1…9, 0" = "1…9, 0"
"30 days" = "30 dagar"
"90 days" = "90 dagar"
"@{login}: {prs} PRs, {commits} commits, +{added} / −{deleted} lines (Δ {delta}), +{bin_added} / −{bin_deleted} binary assets, {first} – {last}" = "@{login}: {prs} PR:er, {commits} commits, +{added} / −{deleted} rader (Δ {delta}), +{bin_added} / −{bin_deleted} binära resurser, {first} – {last}"
"A collection of this file with these modes and variables: override their values per mode and add variables of its own" = "En samling i den här filen med dessa lägen och variabler: ange overrides för deras värden per läge och lägg till egna variabler"
"A .figcraft file with this name already exists. Choose its full name to confirm replacement." = "Det finns redan en .figcraft-fil med det här namnet. Välj dess fullständiga namn för att bekräfta att den ersätts."
@@ -290,7 +293,6 @@ name = "Svenska"
"Code" = "Kod"
"Code syntax" = "Kodsyntax"
"Collapse" = "Komprimera"
"Collapse panel" = "Komprimera panel"
"Collection" = "Samling"
"Collections" = "Samlingar"
"Color" = "Färg"
@@ -477,6 +479,7 @@ name = "Svenska"
"Drop to import" = "Släpp för att importera"
"Drop to open" = "Släpp för att öppna"
"Drop shadow" = "Slagskugga"
"Drop to use this image" = "Släpp för att använda bilden"
"Dual-licensed MIT OR Apache-2.0. Made by the ArtCraft team and community." = "Dubbellicensierad under MIT OR Apache-2.0. Skapad av ArtCraft-teamet och gemenskapen."
"Duo" = "Duo"
"Duplicate" = "Duplicera"
@@ -652,6 +655,7 @@ name = "Svenska"
"Help page" = "Hjälpsida"
"Here: {names}" = "Här: {names}"
"Hidden" = "Dold"
"Hide UI" = "Dölj gränssnitt"
"Hide contents" = "Dölj innehåll"
"Hide from publishing" = "Dölj vid publicering"
"Hide section contents" = "Dölj avsnittets innehåll"
@@ -832,6 +836,9 @@ name = "Svenska"
"Make slot" = "Gör till plats"
"New collection" = "Ny samling"
"Nobody shares a file there now." = "Ingen delar någon fil där just nu."
"Past 30 days" = "Senaste 30 dagarna"
"Past 90 days" = "Senaste 90 dagarna"
"Past year" = "Senaste året"
"Pasted design layers" = "Inklistrade designlager"
"Pasted design layers; the clipboard didn't carry the images of: {layers}" = "Designlager inklistrade; urklippet innehöll inte bilderna för: {layers}"
"Remove these results from the file" = "Ta bort de här resultaten från filen"
@@ -977,6 +984,7 @@ name = "Svenska"
"Not read yet" = "Inte läst än"
"Not shared" = "Inte delad"
"Note {n}" = "Anteckning {n}"
"Nothing counted yet" = "Inget har räknats ännu"
"Nothing changed since this version." = "Ingenting har ändrats sedan den här versionen."
"Nothing changed since this was marked ready for dev." = "Inget har ändrats sedan detta markerades som klart för utveckling."
"Nothing here yet. Set a frame's status to list it." = "Inget här än. Ange en frames status för att lista den."
@@ -985,6 +993,9 @@ name = "Svenska"
"Nov" = "nov"
"Now" = "Nu"
"Nudge (Shift: big nudge)" = "Flytta stegvis (Shift: stort steg)"
"Rotate a degree (Shift: 15)" = "Rotera en grad (Shift: 15)"
"⌥⌘ ← ↑ → ↓" = "⌥⌘ ← ↑ → ↓"
"Ctrl+Alt+← ↑ → ↓" = "Ctrl+Alt+← ↑ → ↓"
"Nudge amount" = "Steglängd"
"Number" = "Nummer"
"Number ↑" = "Nummer ↑"
@@ -1179,6 +1190,7 @@ name = "Svenska"
"Remove" = "Ta bort"
"Remove all" = "Ta bort alla"
"Remove annotation" = "Ta bort anteckning"
"Remove all auto layout" = "Ta bort all auto layout"
"Remove auto layout" = "Ta bort auto layout"
"Remove column" = "Ta bort kolumn"
"Remove dev resource" = "Ta bort utvecklarresurs"
@@ -1309,8 +1321,11 @@ name = "Svenska"
"Search files and templates" = "Sök efter filer och mallar"
"Search results" = "Sökresultat"
"Search fonts" = "Sök typsnitt"
"This server doesn't count insertions" = "Den här servern räknar inte infogningar"
"This server doesn't count styles and variables" = "Den här servern räknar inte stilar och variabler"
"Someone who left" = "Någon som har lämnat"
"Take the results off the board; they stay in the file" = "Ta bort resultaten från tavlan; de finns kvar i filen"
"Upload from computer" = "Ladda upp från datorn"
"Use fonts installed on this computer…" = "Använd typsnitt som är installerade på den här datorn…"
"Search layers" = "Sök lager"
"Search pages" = "Sök sidor"
@@ -1373,6 +1388,7 @@ name = "Svenska"
"Show device frame" = "Visa enhetsram"
"Show dimensions on objects" = "Visa dimensioner på objekt"
"Show hotspot hints" = "Visa tips om aktiva punkter"
"The bars are hidden. {shortcut} shows them again" = "Fälten är dolda. {shortcut} visar dem igen"
"Show in Explorer" = "Visa i Utforskaren"
"Show in Finder" = "Visa i Finder"
"Show in folder" = "Visa i mapp"
@@ -1864,6 +1880,7 @@ name = "Svenska"
"video triggers are not supported and were skipped" = "videoutlösare stöds inte och hoppades över"
"yesterday" = "i går"
"{count} in it now · Changed {date}" = "{count} i den nu · Ändrad {date}"
"{insertions} · {detachments}" = "{insertions} · {detachments}"
"{instances} in {files}" = "{instances} i {files}"
"{language}: draft translation, waiting for a native speaker's review." = "{language}: utkast till översättning, väntar på granskning av en modersmålstalare."
"{length} bleed" = "{length} utfall"
@@ -1902,6 +1919,7 @@ name = "Svenska"
"{n} detached" = { one = "{n} bortkopplad", other = "{n} bortkopplade" }
"{n} files" = { one = "{n} fil", other = "{n} filer" }
"{n} hours ago" = { one = "för {n} timme sedan", other = "för {n} timmar sedan" }
"{n} inserted" = { one = "{n} infogad", other = "{n} infogade" }
"{n} instances" = { one = "{n} instans", other = "{n} instanser" }
"{n} layers" = { one = "{n} lager", other = "{n} lager" }
"{n} layers as one file" = { one = "{n} lager som en fil", other = "{n} lager som en fil" }
@@ -1932,6 +1950,7 @@ name = "Svenska"
"{n}w" = "{n} v"
"{page}, nothing selected" = "{page}, inget markerat"
"{percent}%" = "{percent} %"
"{period}: {counts}" = "{period}: {counts}"
"{profile} (current)" = "{profile} (aktuell)"
"{property} is its value; {property ? \"a\" : \"b\"} picks a string. Other {…} stays as written." = "{property} är dess värde; {property ? \"a\" : \"b\"} väljer en sträng. Andra {…} lämnas som de är skrivna."
"{server} can't say what became of your files (it is older than this app)." = "{server} kan inte säga vad som hände med dina filer (den är äldre än den här appen)."
@@ -1939,6 +1958,7 @@ name = "Svenska"
"{server} · {shared} · Opened {date}" = "{server} · {shared} · Öppnad {date}"
"{tool} hold {key}" = "{tool} håll ned {key}"
"{used} · {detached}" = "{used} · {detached}"
"{used} · {inserted}" = "{used} · {inserted}"
"{value} isn't a colour" = "{value} är inte en färg"
"{when} · edited" = "{when} · ändrad"
"← ↑ → ↓" = "← ↑ → ↓"
crates/ui-egui/locales/th.toml
-1
View File
@@ -273,7 +273,6 @@ status = "draft — needs native review"
"Code" = "โค้ด"
"Code syntax" = "ไวยากรณ์โค้ด"
"Collapse" = "ยุบ"
"Collapse panel" = "ยุบแผง"
"Collection" = "คอลเลกชัน"
"Collections" = "คอลเลกชัน"
"Color" = "สี"
crates/ui-egui/locales/tr.toml
-1
View File
@@ -269,7 +269,6 @@ name = "Türkçe"
"Code" = "Kod"
"Code syntax" = "Kod söz dizimi"
"Collapse" = "Daralt"
"Collapse panel" = "Paneli daralt"
"Collection" = "Koleksiyon"
"Collections" = "Koleksiyonlar"
"Color" = "Renk"
crates/ui-egui/locales/vi.toml
-1
View File
@@ -256,7 +256,6 @@ status = "draft — needs native review"
"Code or invite link" = "Mã hoặc liên kết mời"
"Code syntax" = "Cú pháp mã"
"Collapse" = "Thu gọn"
"Collapse panel" = "Thu gọn bảng"
"Collection" = "Bộ sưu tập"
"Collections" = "Bộ sưu tập"
"Color" = "Màu"
crates/ui-egui/locales/zh-Hans.toml
-1
View File
@@ -261,7 +261,6 @@ status = "draft — needs native review"
"Code" = "代码"
"Code syntax" = "代码语法"
"Collapse" = "折叠"
"Collapse panel" = "折叠面板"
"Collection" = "集合"
"Collections" = "集合"
"Color" = "颜色"
crates/ui-egui/src/app.rs
+17 -5
View File
@@ -274,12 +274,21 @@ impl FigApp {
return;
}
let hidden = self.session.ds().map(|d| d.view.ui_hidden).unwrap_or(false);
// Minimized (Shift+Cmd/Ctrl+\, the Minimize button by the file name): "collapses the
// navigation bar, left sidebar, and right sidebar"; "If you select an object while the
// panels are minimized, the left sidebar remains minimized while the right sidebar expands
// [...] Once all objects are deselected, the right panel minimizes again" (Explore the
// navigation bar and left sidebar). The toolbar stays; Hide UI takes everything.
let narrow = !hidden && ui.available_width() < NARROW_WIDTH;
// A narrow window has no sidebars beside the canvas to take: its panels open from their
// buttons as before, and the interface is minimized again once the window is wide.
let minimized = !hidden && !narrow && self.session.ds().is_ok_and(|d| d.view.ui_minimized);
let right_minimized = minimized && self.session.selection().is_empty();
let mobile = self.ui.mobile_panel.filter(|_| narrow);
self.ui.narrow = narrow;
// A narrow window shows the right panel when its button asks for it, a board's too.
let right_open = (self.right_panel_shown(hidden) && !narrow) || mobile == Some(MobilePanel::Right);
if !hidden && (!narrow || mobile == Some(MobilePanel::Left)) {
let right_open = (self.right_panel_shown(hidden) && !narrow && !right_minimized) || mobile == Some(MobilePanel::Right);
if !hidden && !minimized && (!narrow || mobile == Some(MobilePanel::Left)) {
egui::Panel::left("left_rail")
.exact_size(layers::RAIL_WIDTH)
.resizable(false)
@@ -290,7 +299,7 @@ impl FigApp {
});
}
// The panels are as wide as asked, less in a window too small for them and the canvas.
let left_open = !hidden && if narrow { mobile == Some(MobilePanel::Left) } else { !self.ui.left_collapsed };
let left_open = !hidden && !minimized && if narrow { mobile == Some(MobilePanel::Left) } else { !self.ui.left_collapsed };
let (left_w, right_w) = if narrow {
let w = (ui.available_width() - MOBILE_STRIP).max(0.0);
(if left_open { w } else { 0.0 }, w)
@@ -353,6 +362,8 @@ impl FigApp {
if narrow {
let x = if mobile == Some(MobilePanel::Left) { ctx.content_rect().max.x - MOBILE_STRIP + 4.0 } else { ctx.content_rect().min.x + 4.0 };
self.mobile_buttons(&ctx, egui::pos2(x, rows.min + 8.0));
} else if minimized {
self.expand_button(&ctx, egui::pos2(ctx.content_rect().min.x + 8.0, rows.min + 8.0));
}
// The panels' edges, over the canvas and the panels (drawn after them: they take the press).
for (name, x, shown, grows) in edges {
@@ -385,8 +396,9 @@ impl FigApp {
updates_ui::show(self, &ctx);
self.toast_ui(&ctx);
// A rename started after the layers panel drew (Cmd/Ctrl+R, a double-click) opens its field
// next frame.
if self.ui.rename.is_some_and(|r| r.start) && !hidden && !self.ui.left_collapsed && self.ui.left_tab == LeftTab::File {
// next frame; while the panel isn't drawn (the interface hidden or minimized, the panel
// closed in a narrow window) the rename waits for it without asking for frames.
if self.ui.rename.is_some_and(|r| r.start) && left_open && self.ui.left_tab == LeftTab::File {
ctx.request_repaint();
}
a11y::end(self, &ctx);
crates/ui-egui/src/app/commands.rs
+7
View File
@@ -228,6 +228,13 @@ impl FigApp {
}
"preview.close" => self.ui.preview = None,
"open.help" => self.services.open_url("https://getartcraft.com/apps/figcraft"),
// A link in text activated while editing (`text.openLink`): the engine checked it
// is a web or mail link.
"open.url" => {
if let Some(url) = r.data["url"].as_str() {
self.services.open_url(url);
}
}
"layers.collapseAll" => layers::collapse_all(self),
"contextMenu" => self.ui.key_menu = true,
"selectArea" => self.start_key_box(),
crates/ui-egui/src/app/control.rs
+1
View File
@@ -102,6 +102,7 @@ impl FigApp {
"importReport": self.ui.import_report.as_ref().map(import_report::Report::inspect),
});
state["homeSearch"] = json!(self.ui.home_view.file_query);
state["panels"]["minimized"] = json!(self.session.ds().is_ok_and(|d| d.view.ui_minimized));
// Set apart from the literal above, which is at the macro recursion limit.
state["uiScale"] = json!({"choice": self.session.prefs.ui_scale, "zoom": self.ui.ui_scale.zoom, "drawn": self.ui.ui_scale.drawn, "limited": self.ui.ui_scale.limited});
state["pendingOpens"] = json!(self.ui.pending_opens.len());
crates/ui-egui/src/app/frame.rs
+16
View File
@@ -247,6 +247,22 @@ impl FigApp {
});
}
/// The way back from a minimized interface by mouse: a small Panels button at the top left of
/// the canvas, where the navigation bar was (the shortcut works too).
pub(super) fn expand_button(&mut self, ctx: &egui::Context, at: egui::Pos2) {
use a11y::Tip as _;
let t = theme::Tokens::get(ctx);
egui::Area::new(egui::Id::unique("expand_interface")).order(egui::Order::Foreground).fixed_pos(at).show(ctx, |ui| {
let (r, resp) = ui.allocate_exact_size(egui::vec2(32.0, 32.0), egui::Sense::click());
let resp = resp.tip(i18n::tr("Expand the interface"));
ui.painter().rect(r, 8.0, t.panel, egui::Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
icons::paint(ui.painter(), r.shrink(8.0), icons::Icon::Panels, t.icon);
if resp.clicked() {
self.run("view.minimize", serde_json::json!({}));
}
});
}
/// Draw the toast: start its lifetime on the frame **after** the first drawn frame, request
/// that frame and the frame that hides it, expire and remove it at the deadline, and place it
/// at the bottom centre.
crates/ui-egui/src/canvas/board_bar.rs
+5 -2
View File
@@ -299,10 +299,13 @@ fn shape_part(app: &mut FigApp, ui: &mut Ui, shape: BoardShape, at: Pos2, t: &To
let (r, cell) = ui.allocate_exact_size(vec2(CELL, CELL), Sense::click());
let cell = cell.on_hover_text(tr(b.label()));
a11y::menu_item(&cell, tr(b.label()), "", Some(b == shape));
if b == shape || cell.hovered() {
let lit = b == shape || cell.hovered();
if lit {
ui.painter().rect_filled(r, CornerRadius::same(5), t.menu_hover);
}
paint_choice(ui.painter(), r.shrink(6.0), &Mark::Shape(b), t.menu_text);
// The menu is the theme's popup (white in the light theme): the theme's icon
// colour, white only on the green highlight.
paint_choice(ui.painter(), r.shrink(6.0), &Mark::Shape(b), if lit { t.menu_text } else { t.icon });
if cell.clicked() {
app.run("board.setStyle", json!({"shape": b.id()}));
ui.close();
crates/ui-egui/src/idle_tests.rs
+17
View File
@@ -513,3 +513,20 @@ fn a_discarded_sizing_pass_sets_up_and_counts_one_frame_only() {
assert_eq!(passes, 2, "egui reran the frame");
assert_eq!(app.frame_stats.frames, frames + 1, "one frame was drawn, not one per pass");
}
#[test]
fn a_rename_started_while_minimized_waits_for_the_layers_panel_quietly() {
let (mut h, _) = document();
let r = h.run("shape.rectangle", json!({"x": 500, "y": 500, "width": 40, "height": 40}));
h.run("view.minimize", json!({"on": true}));
h.settle();
// What Cmd/Ctrl+R leaves: the field opens when the layers panel next draws, which a minimized
// interface doesn't do; no frame is asked for meanwhile.
h.app.ui.rename = Some(crate::panels::layers::Rename { id: id(&r), start: true });
h.assert_idle("a rename started while the interface is minimized");
h.run("view.minimize", json!({"on": false}));
for _ in 0..3 {
h.frame(vec![]);
}
assert!(h.app.ui.rename.is_some_and(|r| !r.start), "the field opened once the interface expanded");
}
crates/ui-egui/src/lib.rs
+2
View File
@@ -243,6 +243,8 @@ mod table_paste_tests;
#[cfg(test)]
mod text_enter_tests;
#[cfg(test)]
mod text_link_tests;
#[cfg(test)]
mod titlebar_tests;
#[cfg(test)]
mod ui_params_tests;
crates/ui-egui/src/menu_contrast_tests.rs
+106 -2
View File
@@ -1,8 +1,15 @@
//! Panel dropdowns (the prototype device picker, Preferences, blend modes…) draw on the theme's
//! popup fill, so their rows' text must read on it in both themes (#972): drawn headless.
//! Panel dropdowns (the prototype device picker, Preferences, blend modes…), a file tab's menu and
//! the board bar's shape menu draw on the theme's popup fill, so what is in them must read on it
//! in both themes (#972): drawn headless.
use egui::accesskit::Node;
use egui::epaint::ColorMode;
use egui::{Color32, Event, Order, PointerButton, Pos2, RawInput, Rect, Shape, pos2, vec2};
use figcraft_doc::BoardShape;
use figcraft_engine::Session;
use serde_json::json;
use crate::present_tests::Ui;
use crate::right::{menu_check, menu_item, menu_popup};
use crate::theme::{self, Tokens};
@@ -82,3 +89,100 @@ fn dropdown_rows_read_on_the_popup_in_both_themes() {
}
}
}
/// The whole app headless on `s` in the `dark` or light theme, with windows of their own allowed
/// (a tab offers Open in new window only then); the theme's tokens.
fn app(mut s: Session, dark: bool) -> (Ui, Tokens) {
s.execute(if dark { "view.themeDark" } else { "view.themeLight" }, &json!({})).unwrap();
let mut u = Ui::new(s);
u.ctx.set_embed_viewports(false);
u.frame(vec![]);
let t = Tokens::get(&u.ctx);
assert_eq!(t.dark, dark, "the app took the theme");
(u, t)
}
fn click(u: &mut Ui, at: Pos2, button: PointerButton) {
for pressed in [true, false] {
u.frame(vec![Event::PointerMoved(at), Event::PointerButton { pos: at, button, pressed, modifiers: Default::default() }]);
}
}
/// The pointer away from the open menu until its fade-in is over: that frame's output.
fn settle(u: &mut Ui) -> egui::FullOutput {
for _ in 0..30 {
u.frame(vec![Event::PointerMoved(pos2(1430.0, 600.0))]);
}
u.frame_output(vec![])
}
/// The AccessKit nodes on screen.
fn nodes(u: &mut Ui) -> Vec<Node> {
u.ctx.enable_accesskit();
u.frame(vec![]);
u.frame_output(vec![]).platform_output.accesskit_update.expect("an AccessKit update").nodes.into_iter().map(|(_, n)| n).collect()
}
fn bounds(n: &Node) -> Rect {
let b = n.bounds().unwrap();
Rect::from_min_max(pos2(b.x0 as f32, b.y0 as f32), pos2(b.x1 as f32, b.y1 as f32))
}
/// The colours of the lines painted inside `r`.
fn lines_in(out: &egui::FullOutput, r: Rect) -> Vec<Color32> {
fn walk(s: &Shape, r: Rect, out: &mut Vec<Color32>) {
match s {
Shape::Vec(v) => v.iter().for_each(|s| walk(s, r, out)),
Shape::Path(p) if r.contains_rect(s.visual_bounding_rect()) => {
if let ColorMode::Solid(c) = p.stroke.color {
out.push(c);
}
}
_ => {}
}
}
let mut lines = Vec::new();
for c in &out.shapes {
walk(&c.shape, r, &mut lines);
}
lines
}
#[test]
fn a_file_tabs_menu_reads_on_its_popup_in_both_themes() {
for dark in [false, true] {
let (mut u, t) = app(Session::new(), dark);
click(&mut u, pos2(100.0, 20.0), PointerButton::Secondary);
let texts = menu_texts(&settle(&mut u));
let Some((_, col)) = texts.iter().find(|(s, _)| s == "Open in new window") else { panic!("the tab's menu opened (dark {dark}): {texts:?}") };
let ratio = color(*col).contrast(color(t.panel));
assert!(ratio >= 4.5, "Open in new window at {ratio:.2}:1 on the popup (dark {dark})");
}
}
#[test]
fn the_board_bars_shape_menu_shows_every_shape_in_both_themes() {
for dark in [false, true] {
let mut s = Session::new();
s.execute("file.newBoard", &json!({})).unwrap();
s.execute("board.shape", &json!({"shape": "rectangle", "x": 0, "y": 0})).unwrap();
let (mut u, t) = app(s, dark);
let all = nodes(&mut u);
let button = all.iter().find(|n| n.label() == Some("Shape")).expect("the board bar's Shape button");
click(&mut u, bounds(button).center(), PointerButton::Primary);
let all = nodes(&mut u);
let out = settle(&mut u);
// Every shape but the picked one (white on the green highlight) on the popup itself.
for b in BoardShape::ALL.into_iter().filter(|b| *b != BoardShape::Rectangle) {
let label = crate::i18n::tr(b.label());
let cell = all.iter().find(|n| n.label() == Some(label)).unwrap_or_else(|| panic!("{label} in the menu (dark {dark})"));
let lines = lines_in(&out, bounds(cell));
assert!(!lines.is_empty(), "{label}'s outline painted (dark {dark})");
for c in lines {
// Non-text contrast (WCAG 1.4.11): at least 3:1.
let ratio = color(c).contrast(color(t.panel));
assert!(ratio >= 3.0, "{label}'s outline at {ratio:.2}:1 on the popup (dark {dark})");
}
}
}
}
crates/ui-egui/src/panel_width_tests.rs
+84 -1
View File
@@ -160,7 +160,7 @@ fn the_command_sets_and_resets_the_widths() {
u.app.run("view.panelWidths", json!({"left": 320, "right": 400}));
u.frame(vec![]);
assert_eq!(widths(&u), (320.0, 400.0));
assert_eq!(u.app.inspect()["panels"], json!({"left": 320.0, "right": 400.0, "leftCollapsed": false}));
assert_eq!(u.app.inspect()["panels"], json!({"left": 320.0, "right": 400.0, "leftCollapsed": false, "minimized": false}));
u.app.run("view.panelWidths", json!({"left": 5000}));
assert_eq!(widths(&u), (*LEFT_PANEL.end(), 400.0), "within its limits; the other panel as it was");
for junk in [json!({"left": "wide"}), json!({"left": null, "right": null}), json!({})] {
@@ -210,6 +210,58 @@ fn minimize_ui_hides_the_panels_and_keeps_their_widths() {
assert_eq!(edges(&u), (56.0, shown.1));
}
/// The middle of the accessible control with `role` and `label`, if one shows.
fn control(u: &mut Ui, role: egui::accesskit::Role, label: &str) -> Option<Pos2> {
u.ctx.enable_accesskit();
u.frame(vec![]);
let out = u.frame_output(vec![]);
let nodes = out.platform_output.accesskit_update.expect("an AccessKit update").nodes;
let n = nodes.iter().map(|(_, n)| n).find(|n| n.role() == role && n.label() == Some(label))?;
let b = n.bounds()?;
Some(pos2(((b.x0 + b.x1) / 2.0) as f32, ((b.y0 + b.y1) / 2.0) as f32))
}
/// "You can click Minimize next to the file name to collapse the navigation bar, left sidebar,
/// and right sidebar" (Explore the navigation bar and left sidebar; Shift+Cmd/Ctrl+\ too): the
/// rail and both sidebars go, the toolbar and the widths stay. "If you select an object while
/// the panels are minimized, the left sidebar remains minimized while the right sidebar expands
/// [...] Once all objects are deselected, the right panel minimizes again." The Expand button at
/// the top left puts everything back (#1835).
#[test]
fn minimize_collapses_the_rail_and_both_sidebars_and_the_right_one_follows_the_selection() {
use egui::accesskit::Role;
let (mut u, _) = ui();
u.app.run("view.panelWidths", json!({"left": 320, "right": 400}));
u.app.run("select.set", json!({"ids": []}));
u.frame(vec![]);
let shown = edges(&u);
let minimize = control(&mut u, Role::Button, "Minimize").expect("the Minimize button by the file name");
u.button(minimize, true);
u.button(minimize, false);
u.frame(vec![]);
assert_eq!(edges(&u), (0.0, 1440.0), "no rail and no sidebars: the canvas has the window");
assert!(control(&mut u, Role::Toolbar, "Tools").is_some(), "the toolbar stays");
assert_eq!(widths(&u), (320.0, 400.0), "the widths are kept");
// A selection brings the right sidebar, the left stays away; deselecting takes it again.
u.app.run("select.all", json!({}));
u.frame(vec![]);
assert!(edges(&u).0 == 0.0 && edges(&u).1 < 1440.0, "the right sidebar shows for the selection: {:?}", edges(&u));
u.app.run("select.set", json!({"ids": []}));
u.frame(vec![]);
assert_eq!(edges(&u), (0.0, 1440.0), "and goes once nothing is selected");
// Expand puts the interface back as it was.
let expand = control(&mut u, Role::Button, "Expand the interface").expect("the Expand button at the top left");
u.button(expand, true);
u.button(expand, false);
u.frame(vec![]);
assert_eq!((edges(&u), widths(&u)), (shown, (320.0, 400.0)), "back as it was");
assert!(control(&mut u, Role::Button, "Expand the interface").is_none());
// Hide UI hides the toolbar as well, as before.
u.app.run("view.toggleUi", json!({}));
assert!(control(&mut u, Role::Toolbar, "Tools").is_none(), "Hide UI takes the toolbar too");
u.app.run("view.toggleUi", json!({}));
}
#[test]
fn the_smallest_window_keeps_its_canvas_whatever_the_widths() {
for asked in [(240.0, 240.0), (480.0, 480.0), (480.0, 240.0), (200.0, 480.0)] {
@@ -231,6 +283,37 @@ fn the_smallest_window_keeps_its_canvas_whatever_the_widths() {
}
}
/// Minimize takes nothing from a phone-sized window, which has no sidebars beside the canvas: its
/// panels open from their buttons as before, and the interface is minimized again once the window
/// is wide.
#[test]
fn a_narrow_window_keeps_its_panel_buttons_while_minimized() {
use crate::MobilePanel;
let ctx = egui::Context::default();
let mut app = FigApp::new(Session::new(), Box::new(NoServices));
let mut k = 0.0;
let mut canvas_width = |app: &mut FigApp, size: egui::Vec2| {
for _ in 0..4 {
k += 1.0 / 60.0;
let input = RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, size)), time: Some(k), ..Default::default() };
ctx.run_ui(input, |ui| app.ui(ui)).textures_delta.clear();
}
app.canvas.rect.width()
};
let phone = vec2(390.0, 844.0);
app.run("view.minimize", json!({"on": true}));
assert!(canvas_width(&mut app, phone) >= 380.0, "closed panels leave the whole width");
app.ui.mobile_panel = Some(MobilePanel::Left);
let w = canvas_width(&mut app, phone);
assert!((1.0..=60.0).contains(&w), "the Layers button opens the left panel while minimized: {w}");
app.ui.mobile_panel = None;
let wide = canvas_width(&mut app, vec2(1440.0, 900.0));
assert!(wide >= 1439.0, "wide again, the interface is minimized: the canvas has the window ({wide})");
app.run("view.minimize", json!({"on": false}));
let wide = canvas_width(&mut app, vec2(1440.0, 900.0));
assert!(wide > 600.0 && wide < 1100.0, "expanded, both panels are beside the canvas again ({wide})");
}
/// A phone-sized window: the canvas has the whole width, and each side panel opens alone over it,
/// leaving the strip with the panel buttons. A wide window ignores the choice.
#[test]
crates/ui-egui/src/panels/layers.rs
+4 -2
View File
@@ -159,13 +159,15 @@ pub fn left_panel(app: &mut FigApp, ui: &mut Ui) {
ui.painter().text(pos2(head.min.x + 16.0, head.min.y + 46.0), Align2::LEFT_CENTER, tr("Drafts"), regular(11.0), t.text_secondary);
}
let hr = Rect::from_center_size(pos2(head.max.x - 24.0, head.min.y + 24.0), vec2(24.0, 24.0));
let hresp = ui.interact(hr, ui.scope_id().with("hideui"), Sense::click()).tip(tr("Collapse panel"));
// Minimize, by the file name: "click Minimize next to the file name to collapse the
// navigation bar, left sidebar, and right sidebar" (Explore the navigation bar and left sidebar).
let hresp = ui.interact(hr, ui.scope_id().with("hideui"), Sense::click()).tip(tr("Minimize"));
if hresp.hovered() {
ui.painter().rect_filled(hr, CornerRadius::same(5), t.hover);
}
icons::paint(ui.painter(), hr.shrink(5.0), Icon::Panels, t.icon);
if hresp.clicked() {
app.ui.close_left_panel();
app.run("view.minimize", json!({}));
}
ui.painter().line_segment([head.left_bottom(), head.right_bottom()], Stroke::new(1.0, t.border));
match app.ui.left_tab {
crates/ui-egui/src/panels/typography/fields.rs
+12
View File
@@ -385,6 +385,18 @@ fn type_settings(
if let Some(i) = text_seg(ui, "trim", &items, trim, w) {
app.set_props(ids, json!({"leadingTrim": if i == 1 { "capHeight" } else { "none" }}));
}
// Where lines break when the text wraps (Explore text properties).
caption(ui, tr("Wrap style"));
let wrap = common(doc, ids, |n| n.kind.text().map(|t| t.wrap_style as usize)).flatten();
let items = [
(tr("Auto"), tr_noop("Auto: as many words as fit on each line")),
(tr("Balance"), tr_noop("Balance: every line close to the same length")),
(tr("Pretty"), tr_noop("Pretty: full lines, no one word alone on the last")),
];
if let Some(i) = text_seg(ui, "wrap", &items, wrap, w) {
let style = ["auto", "balance", "pretty"].get(i).copied().unwrap_or("auto");
app.set_props(ids, json!({"wrapStyle": style}));
}
let resize = common(doc, ids, |n| n.kind.text().map(|t| t.auto_resize)).flatten();
// Auto-height text with a line limit truncates too.
let truncating = common(doc, ids, |n| n.kind.text().map(TextData::truncates)).flatten();
crates/ui-egui/src/shortcuts_tests.rs
+5 -1
View File
@@ -124,8 +124,12 @@ fn panel_keys_and_cmd_k() {
press(&mut u, Key::D, Modifiers::SHIFT);
assert_eq!(u.app.ui.right_tab, RightTab::Design);
let collapsed = u.app.ui.left_collapsed;
let minimized = |u: &Ui| u.app.session.ds().unwrap().view.ui_minimized;
press(&mut u, Key::Backslash, Modifiers::SHIFT | Modifiers::COMMAND);
assert_eq!(u.app.ui.left_collapsed, !collapsed, "Shift+Cmd+\\ toggles the left sidebar");
assert!(minimized(&u), "Shift+Cmd+\\ minimizes the interface");
assert_eq!(u.app.ui.left_collapsed, collapsed, "without collapsing the left sidebar for good");
press(&mut u, Key::Backslash, Modifiers::SHIFT | Modifiers::COMMAND);
assert!(!minimized(&u), "and back");
press(&mut u, Key::K, Modifiers::COMMAND);
assert!(u.app.ui.palette.is_some(), "Cmd+K opens Actions on the canvas");
}
crates/ui-egui/src/tabs.rs
+4 -3
View File
@@ -162,9 +162,10 @@ pub fn tab_bar(app: &mut FigApp, ui: &mut Ui) {
None => {}
}
if several {
resp.context_menu(|ui| {
ui.set_width(200.0);
if crate::menus::item(ui, tr("Open in new window"), "", true, false, &t) {
// The tab strip's own menu takes the theme like its overflow menus (the in-app
// menus stay dark, #843): its rows read on the white popup of the light theme.
crate::right::context_popup(&resp).show(|ui| {
if crate::right::menu_item(ui, tr("Open in new window"), "") {
detach = Some((i, None));
ui.close();
}
crates/ui-egui/src/text_link_tests.rs
+60
View File
@@ -0,0 +1,60 @@
//! Alt+Enter while editing text opens the link at the caret through the platform ("When editing
//! text, press ⌥Option Return/Alt Enter to activate a focused link", Accessibility at Figma),
//! driven through egui headless with a recording opener; editing goes on.
use std::sync::{Arc, Mutex};
use egui::{Event, Key, Modifiers};
use figcraft_doc::NodeId;
use figcraft_engine::Session;
use serde_json::json;
use crate::Services;
use crate::layers_drag_tests::Ui;
/// Records every URL the app asks the platform to open.
#[derive(Default, Clone)]
struct Opened(Arc<Mutex<Vec<String>>>);
impl Services for Opened {
fn open_url(&mut self, url: &str) {
if let Ok(mut v) = self.0.lock() {
v.push(url.to_string());
}
}
}
fn alt_enter(u: &mut Ui) {
let modifiers = Modifiers::ALT;
u.frame_with(
vec![
Event::Key { key: Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers },
Event::Key { key: Key::Enter, physical_key: None, pressed: false, repeat: false, modifiers },
],
modifiers,
);
u.frame(vec![]);
}
#[test]
fn alt_enter_opens_the_link_at_the_caret_while_editing() {
let mut s = Session::new();
let t = NodeId(s.execute("text.create", &json!({"text": "See the docs now", "x": 20, "y": 20})).unwrap()["id"].as_u64().unwrap());
s.execute("text.style", &json!({"id": t, "start": 4, "end": 12, "hyperlink": "https://example.com/docs"})).unwrap();
s.execute("text.edit.begin", &json!({"id": t, "caret": 2})).unwrap();
let opened = Opened::default();
let mut u = Ui::new(s);
u.app.services = Box::new(opened.clone());
u.frame(vec![]);
alt_enter(&mut u);
assert!(opened.0.lock().unwrap().is_empty(), "no link at the caret: nothing opens");
assert!(u.app.session.ds().unwrap().text_edit.is_some(), "still editing");
u.app.session.execute("text.edit.caret", &json!({"index": 6})).unwrap();
alt_enter(&mut u);
assert_eq!(*opened.0.lock().unwrap(), vec!["https://example.com/docs".to_string()]);
assert!(u.app.session.ds().unwrap().text_edit.is_some(), "still editing");
// Not a web or mail link: nothing opens.
u.app.session.execute("text.style", &json!({"id": t, "start": 4, "end": 12, "hyperlink": "file:///etc/passwd"})).unwrap();
alt_enter(&mut u);
assert_eq!(opened.0.lock().unwrap().len(), 1);
}
docs/auto-layout-parity.md
+7 -1
View File
@@ -1,6 +1,6 @@
# Auto layout and constraints parity
> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-11-01 · **Change:** minor (a text keeps a max height or a number of max lines, not both, as the Guide to auto layout says: a max height sets max lines to Auto and max lines remove the max height; Remove all auto layout, as the help center's More layout options has it: `layout.removeAll` takes the auto layout off a frame and every frame nested in it in one undo step; grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); Layout sidebar: Add auto layout (+) is available for groups and converts a single group to a frame in place, with mask order, flow-only inference and Fill sizing preserved; adding auto layout to an empty frame keeps its size (#369); `node.set` applies auto layout keys only to frames, with warnings (#603); core editor leftovers: auto gap handles, wrapped-line alignment; behaviour suite written from the public documentation, every rule's status; fixes and the missing settings it found) · **Target:** Figma Design (desktop app 126.10.7)
> **Last reviewed:** 2026-10-11 · **Last updated:** 2026-11-02 · **Change:** patch (fill children share the free space by their content area, border-box fashion, as the Flexbox article says (#1824); double-click an edge of an auto layout frame's box for Hug contents, Alt+double-click an edge of a child's box for Fill container, as the Guide to auto layout says (#1838); a child resized to the full available space of its auto layout frame becomes Fill container on that axis, as the Guide to auto layout says; a text keeps a max height or a number of max lines, not both, as the Guide to auto layout says: a max height sets max lines to Auto and max lines remove the max height; Remove all auto layout, as the help center's More layout options has it: `layout.removeAll` takes the auto layout off a frame and every frame nested in it in one undo step; grid auto-placement looks for free cells a 64-bit word at a time and skips what blocks it, with the same placements (#1083); Layout sidebar: Add auto layout (+) is available for groups and converts a single group to a frame in place, with mask order, flow-only inference and Fill sizing preserved; adding auto layout to an empty frame keeps its size (#369); `node.set` applies auto layout keys only to frames, with warnings (#603); core editor leftovers: auto gap handles, wrapped-line alignment; behaviour suite written from the public documentation, every rule's status; fixes and the missing settings it found) · **Target:** Figma Design (desktop app 126.10.7)
Auto layout is the most used layout feature in Figma and the one where small differences (a
hugging frame one pixel off, text wrapping at another width) break real files. **Breadth ~98%,
@@ -38,8 +38,11 @@ Status: **pass** (a case in the suite holds), **fixed** (the suite found a diver
| Hug: the frame sizes to its children plus padding (the 40 px text + 10 px padding = 60 px example) | pass | `sizing_rules` |
| Fixed: the frame keeps its size whatever its children need | pass | `sizing_rules` |
| Fill: children share the space left after padding, gaps and fixed siblings; across the flow they stretch | pass | `sizing_rules` |
| Fill children share by their content area (border-box): a child with more padding or a thicker included inside stroke takes a little more, so the content areas come out the same | **fixed** | "Figma distributes space amongst fill container children by the children's content area instead of by their size, matching the CSS border-box model. A layer with a thicker stroke will take up slightly more of the available width or height, so that its inner content area matches its sibling's" (Use auto layout with CSS Flexbox in mind); the split went by outer size before. Min and max still clamp the outer size; a child's own insets are its padding and its included inside stroke (`nested_tests::fill_children_share_by_content_area`; #1824) |
| Fill on a child turns its hugging parent Fixed on that axis | pass | `al_behaviour_tests::fill_on_a_child_turns_the_hugging_parent_fixed` |
| A child resized to the full available space becomes Fill container on that axis | **fixed** | "Child objects of an auto layout frame will also be set to Fill container if they are manually resized to the full available space of the parent frame": a width or height given by a resize, the W/H fields or a canvas handle that equals the frame's size less its padding sets Fill there: across the flow for any child, along the flow for a lone child (beside siblings what is left depends on the gaps, the alignment and overflow, so it is left alone); not in a hugging or wrapping frame or a grid. It stayed Fixed before (`al_behaviour_tests::a_child_resized_to_the_full_available_space_becomes_fill`) |
| Hug only on auto layout frames (and text); Fill only in an auto layout flow, never on a top-level frame | pass | `al_behaviour_tests::hug_and_fill_only_where_they_apply` |
| Double-click an edge of an auto layout frame's box: Hug contents on that axis; Alt+double-click an edge of a child's box: Fill container | **fixed** | "Tip: Double-click the vertical or horizontal edge of an auto layout object's bounding box to set it to Hug contents."; "Hold ⌥ Option or Alt and double-click the vertical or horizontal edge of an auto layout object's bounding box to set it to Fill container." A vertical edge sizes the width, a horizontal one the height; any other layer keeps the double-click's old meaning (#1838). `double_click_tests::a_double_click_on_an_auto_layout_edge_hugs_and_with_alt_fills` |
| Min/max width and height bound Hug, Fill and Fixed sizes, on frames and children | pass | `sizing_rules`; a fill child at its max leaves the rest to the other fill children (silent on redistribution: CSS flexbox) |
| A hugging text wider than its max width wraps at the max | pass | `sizing_rules` |
| A text has a max height or a number of max lines, not both: a max height sets max lines to Auto, a number of max lines removes the max height | **fixed** | both coexisted; `node.set {maxHeight}` and `{maxLines}` and `text.maxLines` keep one of the two (a frame's max height is untouched); `text_behaviour_tests::a_text_has_a_max_height_or_max_lines_not_both` |
@@ -97,6 +100,9 @@ Status: **pass** (a case in the suite holds), **fixed** (the suite found a diver
| Date | Change | Summary |
|---|---|---|
| 2026-11-02 | patch | M2, #1824: fill container children share the free space by their content area: each one's own insets (padding and an included inside stroke, from the same `insets` the frame uses) come off the free space before the equal split and go back on its share, so a child with more padding or a thicker inside stroke takes a little more and the content areas match ("Figma distributes space amongst fill container children by the children's content area instead of by their size, matching the CSS border-box model", Use auto layout with CSS Flexbox in mind). Min and max still clamp the outer sizes and the frozen-share loop is as it was; children without insets split as before. Test: `nested_tests::fill_children_share_by_content_area` |
| 2026-11-02 | patch | M2, #1838: a double-click on an edge of an auto layout frame's bounding box sets Hug contents on that axis, Alt+double-click on an edge of a child's Fill container ("Double-click the vertical or horizontal edge of an auto layout object's bounding box to set it to Hug contents", "Hold ⌥ Option or Alt and double-click ... to set it to Fill container", Guide to auto layout); a vertical edge sizes the width, a horizontal one the height; the Keyboard shortcuts panel lists both gestures. Test: `double_click_tests::a_double_click_on_an_auto_layout_edge_hugs_and_with_alt_fills`. Numbers unchanged. |
| 2026-11-02 | patch | M2: a child of an auto layout frame resized to the full space available to it on an axis (the frame's size less its padding: across the flow for any child, along the flow for a lone child) becomes Fill container on that axis, whether by `transform.resize`, the W/H fields or a canvas handle ("Child objects of an auto layout frame will also be set to Fill container if they are manually resized to the full available space of the parent frame", Guide to auto layout). Any other size keeps the axis Fixed as before; beside siblings along the flow, in a hugging or wrapping frame, in a grid and for a layer that ignores the layout nothing changes. Test: `al_behaviour_tests::a_child_resized_to_the_full_available_space_becomes_fill` |
| 2026-11-01 | patch | M2: a text layer keeps a max height or a number of max lines, not both ("Text layers cannot have both a max height and a set number of max lines", Guide to auto layout): `node.set {maxHeight}` on a text sets its max lines to Auto, and `node.set {maxLines}` or `text.maxLines` with a number removes its max height. Found by a documentation audit of this page. Test: `text_behaviour_tests::a_text_has_a_max_height_or_max_lines_not_both`. Numbers unchanged |
| 2026-11-01 | minor | M2: Remove all auto layout ("To remove auto layout from a frame and all of its nested objects at once, right-click on the frame and go to More layout options > Remove all auto layout", Toggle on auto layout in designs): `layout.removeAll {ids?}` strips the frames and every frame nested in them in one undo step, leaving instances and their layers alone; in the canvas context menu beside Add auto layout and in the Actions palette. Found by a documentation audit of this page. Test: `al_nesting_tests::remove_all_auto_layout_strips_the_frame_and_every_frame_nested_in_it`. Numbers unchanged |
| 2026-10-30 | minor | M8, #1083: grid placement finds free cells on a bitmap, a word at a time, with the same placements; crafted grids of wide children no longer stall a layout pass. Numbers unchanged. |
Loaded 100 of 101 files, more files were not shown because too many files have changed in this diff. Show more