fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-01 22:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Defer an empty side's inner extent in extend

Browse Source
This commit is contained in:
Dennis Kobert
2026-08-22 19:11:48 +00:00
parent a2918887f6
commit f2b0f7c533
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-graph/nodes/graphic/src/graphic.rs
+13 -3
View File
@@ -524,14 +524,24 @@ pub fn extend<T>(
} }
/// The top level sums both sides; inner levels must agree (rectangular), a /// The top level sums both sides; inner levels must agree (rectangular), a
/// free side defers to the other. /// free side or a side with no top-level lanes defers to the other.
fn extend_extent(base: ExtentIn<'_>, new: ExtentIn<'_>, level: LevelIn) -> GPoll<Extent> { fn extend_extent(base: ExtentIn<'_>, new: ExtentIn<'_>, level: LevelIn) -> GPoll<Extent> {
match level.top() { match level.top() {
true => Extent::sum(base.at(level), new.at(level)), true => Extent::sum(base.at(level), new.at(level)),
false => base.at(level).zip(new.at(level)).and_then(|extents| match extents { false => base.at(level).zip(new.at(level)).and_then(|extents| match extents {
(Extent::Free, other) | (other, Extent::Free) => GPoll::Final(other), (Extent::Free, other) | (other, Extent::Free) => GPoll::Final(other),
(base, new) if base == new => GPoll::Final(base), (base_inner, new_inner) if base_inner == new_inner => GPoll::Final(base_inner),
_ => GPoll::error("extend inner extents differ"), (base_inner, new_inner) => {
let top = LevelIn {
level: level.depth - 1,
depth: level.depth,
};
match (base.at(top), new.at(top)) {
(GPoll::Final(Extent::Exactly(0)), _) => GPoll::Final(new_inner),
(_, GPoll::Final(Extent::Exactly(0))) => GPoll::Final(base_inner),
_ => GPoll::error("extend inner extents differ"),
}
}
}), }),
} }
} }