Skip to content

Commit c98477d

Browse files
authored
Rename graphic subtypes to remove their "data" and "group" suffixes (#2990)
* Rename VectorData to Vector * Rename other VectorData* types to Vector* * Move assorted data types out of vector_data.rs into misc.rs * Rename vector_data.rs to vector_types.rs and remove the vector_types module folder * Rename other references to "vector data" * Remove label widgets for raster/vector/group to use "-" instead * Rename RasterData to Raster * Rename GraphicGroup to Group * Fix migrations and rename graphic_element.rs -> graphic.rs * Rename TaggedValue::ArtboardGroup -> TaggedValue::Artboard
1 parent 853c26c commit c98477d

File tree

72 files changed

+1813
-1894
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1813
-1894
lines changed

demo-artwork/changing-seasons.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/isometric-fountain.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/marbled-mandelbrot.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/painted-dreams.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/parametric-dunescape.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/procedural-string-lights.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/red-dress.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/valley-of-spires.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/src/messages/portfolio/document/document_message_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
692692
});
693693

694694
if layer_to_move.parent(self.metadata()) != Some(parent) {
695-
// TODO: Fix this so it works when dragging a layer into a group parent which has a Transform node, which used to work before #2689 caused this regression by removing the empty VectorData table row.
695+
// TODO: Fix this so it works when dragging a layer into a group parent which has a Transform node, which used to work before #2689 caused this regression by removing the empty vector table row.
696696
// TODO: See #2688 for this issue.
697697
let layer_local_transform = self.network_interface.document_metadata().transform_to_viewport(layer_to_move);
698698
let undo_transform = self.network_interface.document_metadata().transform_to_viewport(parent).inverse();
@@ -2907,7 +2907,7 @@ impl DocumentMessageHandler {
29072907
/// Create a network interface with a single export
29082908
fn default_document_network_interface() -> NodeNetworkInterface {
29092909
let mut network_interface = NodeNetworkInterface::default();
2910-
network_interface.add_export(TaggedValue::ArtboardGroup(Default::default()), -1, "", &[]);
2910+
network_interface.add_export(TaggedValue::Artboard(Default::default()), -1, "", &[]);
29112911
network_interface
29122912
}
29132913

editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
174174
GraphOperationMessage::NewVectorLayer { id, subpaths, parent, insert_index } => {
175175
let mut modify_inputs = ModifyInputsContext::new(network_interface, responses);
176176
let layer = modify_inputs.create_layer(id);
177-
modify_inputs.insert_vector_data(subpaths, layer, true, true, true);
177+
modify_inputs.insert_vector(subpaths, layer, true, true, true);
178178
network_interface.move_layer_to_stack(layer, parent, insert_index, &[]);
179179
responses.add(NodeGraphMessage::RunDocumentGraph);
180180
}
@@ -349,7 +349,7 @@ fn import_usvg_node(modify_inputs: &mut ModifyInputsContext, node: &usvg::Node,
349349
let subpaths = convert_usvg_path(path);
350350
let bounds = subpaths.iter().filter_map(|subpath| subpath.bounding_box()).reduce(Quad::combine_bounds).unwrap_or_default();
351351

352-
modify_inputs.insert_vector_data(subpaths, layer, true, path.fill().is_some(), path.stroke().is_some());
352+
modify_inputs.insert_vector(subpaths, layer, true, path.fill().is_some(), path.stroke().is_some());
353353

354354
if let Some(transform_node_id) = modify_inputs.existing_node_id("Transform", true) {
355355
transform_utils::update_transform(modify_inputs.network_interface, &transform_node_id, transform * usvg_transform(node.abs_transform()));

0 commit comments

Comments
 (0)