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

Migrate attribute call sites from string keys to typed keys

Browse Source
This commit is contained in:
Timon
2026-07-18 13:02:52 +00:00
committed by Keavon Chambers
parent 58178fd48e
commit 475c67facc
31 changed files with 529 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
node-graph/nodes/gstd/src/platform_application_io.rs
View File

@@ -10,9 +10,9 @@ use core_types::list::List;
use core_types::math::bbox::Bbox;
use core_types::ops::Convert;
use core_types::transform::Footprint;
#[cfg(target_family = "wasm")]
use core_types::{ATTR_EDITOR_MERGED_LAYERS, ATTR_TRANSFORM, WasmNotSend};
use core_types::{Color, Ctx};
#[cfg(target_family = "wasm")]
use core_types::{WasmNotSend, attr};
pub use graph_craft::application_io::resource::{Resource, ResourceHash};
pub use graph_craft::application_io::*;
pub use graph_craft::document::value::RenderOutputType;
@@ -243,7 +243,7 @@ where
..Default::default()
};
for transform in data.iter_attribute_values_mut_or_default::<DAffine2>(ATTR_TRANSFORM) {
for transform in data.iter_attr_values_mut_or_default::<attr::Transform>() {
*transform = DAffine2::from_translation(-aabb.start) * *transform;
}
data.render_svg(&mut render, &render_params);
@@ -270,8 +270,8 @@ where
let image = Image::from_image_data(&rasterized.data().0, resolution.x as u32, resolution.y as u32);
List::new_from_item(
Item::new_from_element(Raster::new_cpu(image))
.with_attribute(ATTR_TRANSFORM, footprint.transform)
.with_attribute(ATTR_EDITOR_MERGED_LAYERS, upstream_graphic_list),
.with_attr::<attr::Transform>(footprint.transform)
.with_attr::<graphic_types::attr::editor::MergedLayers>(upstream_graphic_list),
)
}

18
node-graph/nodes/gstd/src/text.rs
View File

@@ -1,6 +1,6 @@
use core_types::Ctx;
use core_types::consts::{DEFAULT_FONT_SIZE, DEFAULT_LINE_HEIGHT};
use core_types::list::{Item, List};
use core_types::{ATTR_FONT, ATTR_FONT_SIZE, ATTR_LETTER_SPACING, ATTR_LETTER_TILT, ATTR_LINE_HEIGHT, ATTR_MAX_HEIGHT, ATTR_MAX_WIDTH, ATTR_TEXT_ALIGN, Ctx};
use graph_craft::application_io::resource::Resource;
use graphic_types::Vector;
pub use text_nodes::*;
@@ -69,28 +69,28 @@ fn text(
let mut item = Item::new_from_element(text);
if font != Resource::default() {
item.set_attribute(ATTR_FONT, font);
item.set_attr::<attr::Font>(font);
}
if (size - DEFAULT_FONT_SIZE).abs() > f64::EPSILON {
item.set_attribute(ATTR_FONT_SIZE, size);
item.set_attr::<core_types::attr::FontSize>(size);
}
if (line_height - DEFAULT_LINE_HEIGHT).abs() > f64::EPSILON {
item.set_attribute(ATTR_LINE_HEIGHT, line_height);
item.set_attr::<core_types::attr::LineHeight>(line_height);
}
if letter_spacing != 0. {
item.set_attribute(ATTR_LETTER_SPACING, letter_spacing);
item.set_attr::<core_types::attr::LetterSpacing>(letter_spacing);
}
if letter_tilt != 0. {
item.set_attribute(ATTR_LETTER_TILT, letter_tilt);
item.set_attr::<core_types::attr::LetterTilt>(letter_tilt);
}
if has_max_width {
item.set_attribute(ATTR_MAX_WIDTH, Some(max_width));
item.set_attr::<core_types::attr::MaxWidth>(Some(max_width));
}
if has_max_height {
item.set_attribute(ATTR_MAX_HEIGHT, Some(max_height));
item.set_attr::<core_types::attr::MaxHeight>(Some(max_height));
}
if align != TextAlign::default() {
item.set_attribute(ATTR_TEXT_ALIGN, align);
item.set_attr::<attr::TextAlign>(align);
}
item