fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-19 02:48:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

New Typography type

Browse Source
This commit is contained in:
Adam
2025-09-07 21:16:05 -07:00
parent 485152bf8d
commit 08b25f689e
13 changed files with 356 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
node-graph/graph-craft/src/document/value.rs
View File

@@ -11,6 +11,7 @@ use graphene_brush::brush_stroke::BrushStroke;
use graphene_core::raster::Image;
use graphene_core::raster_types::{CPU, Raster};
use graphene_core::table::Table;
use graphene_core::text::NewFontCacheWrapper;
use graphene_core::transform::ReferencePoint;
use graphene_core::uuid::NodeId;
use graphene_core::vector::Vector;
@@ -38,7 +39,9 @@ macro_rules! tagged_value {
RenderOutput(RenderOutput),
SurfaceFrame(SurfaceFrame),
#[serde(skip)]
EditorApi(Arc<WasmEditorApi>)
EditorApi(Arc<WasmEditorApi>),
#[serde(skip)]
NewFontCache(NewFontCacheWrapper),
}
// We must manually implement hashing because some values are floats and so do not reproducibly hash (see FakeHash below)
@@ -52,6 +55,7 @@ macro_rules! tagged_value {
Self::RenderOutput(x) => x.hash(state),
Self::SurfaceFrame(x) => x.hash(state),
Self::EditorApi(x) => x.hash(state),
Self::NewFontCache(x) => x.hash(state),
}
}
}
@@ -64,6 +68,7 @@ macro_rules! tagged_value {
Self::RenderOutput(x) => Box::new(x),
Self::SurfaceFrame(x) => Box::new(x),
Self::EditorApi(x) => Box::new(x),
Self::NewFontCache(x) => Box::new(x),
}
}
/// Converts to a Arc<dyn Any + Send + Sync + 'static>
@@ -74,6 +79,7 @@ macro_rules! tagged_value {
Self::RenderOutput(x) => Arc::new(x),
Self::SurfaceFrame(x) => Arc::new(x),
Self::EditorApi(x) => Arc::new(x),
Self::NewFontCache(x) => Arc::new(x),
}
}
/// Creates a graphene_core::Type::Concrete(TypeDescriptor { .. }) with the type of the value inside the tagged value
@@ -83,7 +89,8 @@ macro_rules! tagged_value {
$( Self::$identifier(_) => concrete!($ty), )*
Self::RenderOutput(_) => concrete!(RenderOutput),
Self::SurfaceFrame(_) => concrete!(SurfaceFrame),
Self::EditorApi(_) => concrete!(&WasmEditorApi)
Self::EditorApi(_) => concrete!(&WasmEditorApi),
Self::NewFontCache(_) => concrete!(NewFontCacheWrapper),
}
}
/// Attempts to downcast the dynamic type to a tagged value
@@ -517,6 +524,14 @@ mod fake_hash {
self.1.hash(state)
}
}
impl FakeHash for NewFontCacheWrapper {
fn hash<H: core::hash::Hasher>(&self, state: &mut H) {
match self.0.lock() {
Ok(inner) => inner.hash.hash(state),
Err(_) => log::error!("Could not lock font cache when hashing"),
}
}
}
}
#[test]