Skip to content
Merged
Original file line number Diff line number Diff line change
Expand Up @@ -578,13 +578,13 @@ impl TableItemLayout for Graphic {
fn identifier(&self) -> String {
match self {
Self::None => "None".to_string(),
Self::Graphic(list) => list.identifier(),
Self::Vector(list) => list.identifier(),
Self::RasterCPU(list) => list.identifier(),
Self::RasterGPU(list) => list.identifier(),
Self::Color(list) => list.identifier(),
Self::Gradient(list) => list.identifier(),
Self::Text(list) => list.identifier(),
Self::GraphicList(list) => list.identifier(),
Self::VectorList(list) => list.identifier(),
Self::RasterCPUList(list) => list.identifier(),
Self::RasterGPUList(list) => list.identifier(),
Self::ColorList(list) => list.identifier(),
Self::GradientList(list) => list.identifier(),
Self::TextList(list) => list.identifier(),
}
}
// Don't put a breadcrumb for Graphic
Expand All @@ -594,13 +594,13 @@ impl TableItemLayout for Graphic {
fn value_page(&self, data: &mut LayoutData) -> Vec<LayoutGroup> {
match self {
Self::None => label("None"),
Self::Graphic(list) => list.layout_with_breadcrumb(data),
Self::Vector(list) => list.layout_with_breadcrumb(data),
Self::RasterCPU(list) => list.layout_with_breadcrumb(data),
Self::RasterGPU(list) => list.layout_with_breadcrumb(data),
Self::Color(list) => list.layout_with_breadcrumb(data),
Self::Gradient(list) => list.layout_with_breadcrumb(data),
Self::Text(list) => list.layout_with_breadcrumb(data),
Self::GraphicList(list) => list.layout_with_breadcrumb(data),
Self::VectorList(list) => list.layout_with_breadcrumb(data),
Self::RasterCPUList(list) => list.layout_with_breadcrumb(data),
Self::RasterGPUList(list) => list.layout_with_breadcrumb(data),
Self::ColorList(list) => list.layout_with_breadcrumb(data),
Self::GradientList(list) => list.layout_with_breadcrumb(data),
Self::TextList(list) => list.layout_with_breadcrumb(data),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion editor/src/node_graph_executor/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ impl NodeRuntime {
continue;
};

// Graphic list: thumbnail (text-aware bounds, since the `BoundingBox` trait can't lay out `Graphic::Text` content)
// Graphic list: thumbnail (text-aware bounds, since the `BoundingBox` trait can't lay out `Graphic::TextList` content)
if let Some(io) = introspected_data.downcast_ref::<IORecord<Context, List<Graphic>>>() {
if update_thumbnails {
let bounds = graphene_std::renderer::graphic_list_bounding_box(&io.output, DAffine2::IDENTITY);
Expand Down
4 changes: 2 additions & 2 deletions node-graph/libraries/graphic-types/src/appearance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@ mod tests {
use vector_types::vector::style::{StrokeAlign, StrokeCap, StrokeJoin};

fn solid_paint(color: Color) -> List<Graphic> {
List::new_from_element(Graphic::Color(List::new_from_element(color)))
List::new_from_element(Graphic::ColorList(List::new_from_element(color)))
}

fn paint_color(appearance: &Appearance, index: usize) -> Option<Color> {
let paint = appearance.paint_at(index)?;
let Some(Graphic::Color(colors)) = paint.element(0) else { return None };
let Some(Graphic::ColorList(colors)) = paint.element(0) else { return None };
colors.element(0).copied()
}

Expand Down
2 changes: 1 addition & 1 deletion node-graph/libraries/graphic-types/src/artboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use glam::DAffine2;
/// enclosing `List<Artboard>`, not as fields here. This keeps `Artboard` a pure type-system boundary
/// that prevents arbitrary `List<List<...<Graphic>>>` nesting.
#[derive(Clone, Debug, Default, CacheHash, PartialEq, DynAny)]
pub struct Artboard(List<Graphic>);
pub struct Artboard(pub List<Graphic>);

impl Artboard {
pub fn new(content: List<Graphic>) -> Self {
Expand Down
Loading
Loading