Skip to content

Commit e5d9913

Browse files
adamgerhantadamgerhant
committed
formatting
1 parent 0958e50 commit e5d9913

File tree

10 files changed

+18
-16
lines changed

10 files changed

+18
-16
lines changed

‎editor/src/messages/portfolio/document/utility_types/network_interface/deserialization.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use crate::messages::portfolio::document::{
2-
utility_types::network_interface::{DocumentNodePersistentMetadata, InputMetadata, InputPersistentMetadata, NodeNetworkMetadata, NodeTypePersistentMetadata},
3-
};
1+
use crate::messages::portfolio::document::utility_types::network_interface::{DocumentNodePersistentMetadata, InputMetadata, InputPersistentMetadata, NodeNetworkMetadata, NodeTypePersistentMetadata};
42
use serde_json::Value;
53
use std::collections::HashMap;
64

‎editor/src/messages/tool/common_functionality/gizmos/shape_gizmos/point_radius_handle.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,8 @@ impl PointRadiusHandle {
332332
fn calculate_snap_radii(document: &DocumentMessageHandler, layer: LayerNodeIdentifier, radius_index: usize) -> Vec<f64> {
333333
let mut snap_radii = Vec::new();
334334

335-
let Some(node_inputs) = NodeGraphLayer::new(layer, &document.network_interface).find_node_inputs(&DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::star::IDENTIFIER)) else {
335+
let Some(node_inputs) = NodeGraphLayer::new(layer, &document.network_interface).find_node_inputs(&DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::star::IDENTIFIER))
336+
else {
336337
return snap_radii;
337338
};
338339

@@ -450,7 +451,8 @@ impl PointRadiusHandle {
450451
}
451452

452453
fn check_if_radius_flipped(&mut self, original_radius: f64, new_radius: f64, document: &DocumentMessageHandler, layer: LayerNodeIdentifier, radius_index: usize) {
453-
let Some(node_inputs) = NodeGraphLayer::new(layer, &document.network_interface).find_node_inputs(&DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::star::IDENTIFIER)) else {
454+
let Some(node_inputs) = NodeGraphLayer::new(layer, &document.network_interface).find_node_inputs(&DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::star::IDENTIFIER))
455+
else {
454456
return;
455457
};
456458

‎editor/src/messages/tool/common_functionality/shapes/circle_shape.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
2-
use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_document_node_type, DefinitionIdentifier};
2+
use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type};
33
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
44
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
55
use crate::messages::portfolio::document::utility_types::network_interface::{InputConnector, NodeTemplate};

‎editor/src/messages/tool/common_functionality/shapes/ellipse_shape.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::shape_utility::ShapeToolModifierKey;
22
use super::*;
33
use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
4-
use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_document_node_type, DefinitionIdentifier};
4+
use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type};
55
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
66
use crate::messages::portfolio::document::utility_types::network_interface::{InputConnector, NodeTemplate};
77
use crate::messages::tool::common_functionality::graph_modification_utils;

‎editor/src/messages/tool/common_functionality/shapes/grid_shape.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::shape_utility::ShapeToolModifierKey;
22
use super::*;
33
use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
4-
use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_document_node_type, DefinitionIdentifier};
4+
use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type};
55
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
66
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
77
use crate::messages::portfolio::document::utility_types::network_interface::{InputConnector, NodeTemplate};

‎editor/src/messages/tool/common_functionality/shapes/line_shape.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub struct Line;
3737

3838
impl Line {
3939
pub fn create_node(document: &DocumentMessageHandler, drag_start: DVec2) -> NodeTemplate {
40-
let identifier =DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::star::IDENTIFIER);
40+
let identifier = DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::star::IDENTIFIER);
4141
let node_type = resolve_document_node_type(&identifier).expect("Line node can't be found");
4242
node_type.node_template_input_override([
4343
None,
@@ -89,7 +89,8 @@ impl Line {
8989
.selected_nodes()
9090
.selected_visible_and_unlocked_layers(&document.network_interface)
9191
.filter_map(|layer| {
92-
let node_inputs = NodeGraphLayer::new(layer, &document.network_interface).find_node_inputs(&DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::line::IDENTIFIER))?;
92+
let node_inputs =
93+
NodeGraphLayer::new(layer, &document.network_interface).find_node_inputs(&DefinitionIdentifier::ProtoNode(graphene_std::vector::generator_nodes::line::IDENTIFIER))?;
9394

9495
let (Some(&TaggedValue::DVec2(start)), Some(&TaggedValue::DVec2(end))) = (node_inputs[1].as_value(), node_inputs[2].as_value()) else {
9596
return None;

‎editor/src/messages/tool/common_functionality/shapes/rectangle_shape.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::shape_utility::ShapeToolModifierKey;
22
use super::*;
33
use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
4-
use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_document_node_type, DefinitionIdentifier};
4+
use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type};
55
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
66
use crate::messages::portfolio::document::utility_types::network_interface::{InputConnector, NodeTemplate};
77
use crate::messages::tool::common_functionality::graph_modification_utils;

‎editor/src/messages/tool/tool_messages/brush_tool.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use super::tool_prelude::*;
22
use crate::consts::DEFAULT_BRUSH_SIZE;
33
use crate::messages::portfolio::document::graph_operation::transform_utils::get_current_transform;
4-
use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_document_node_type, DefinitionIdentifier};
4+
use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type};
55
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
66
use crate::messages::portfolio::document::utility_types::network_interface::FlowType;
77
use crate::messages::tool::common_functionality::color_selector::{ToolColorOptions, ToolColorType};
@@ -475,8 +475,9 @@ impl Fsm for BrushToolFsmState {
475475
fn new_brush_layer(document: &DocumentMessageHandler, responses: &mut VecDeque<Message>) -> LayerNodeIdentifier {
476476
responses.add(DocumentMessage::DeselectAllLayers);
477477

478-
let brush_node = resolve_document_node_type(&DefinitionIdentifier::Network("Brush".to_string())).expect("Brush node does not exist").default_node_template();
479-
478+
let brush_node = resolve_document_node_type(&DefinitionIdentifier::Network("Brush".to_string()))
479+
.expect("Brush node does not exist")
480+
.default_node_template();
480481
let id = NodeId::new();
481482
responses.add(GraphOperationMessage::NewCustomLayer {
482483
id,

‎editor/src/messages/tool/tool_messages/freehand_tool.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::tool_prelude::*;
22
use crate::consts::DEFAULT_STROKE_WIDTH;
3-
use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_document_node_type, DefinitionIdentifier};
3+
use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type};
44
use crate::messages::portfolio::document::overlays::utility_functions::path_endpoint_overlays;
55
use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
66
use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;

‎editor/src/messages/tool/tool_messages/path_tool.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::consts::{
66
};
77
use crate::messages::input_mapper::utility_types::macros::action_shortcut_manual;
88
use crate::messages::portfolio::document::graph_operation::utility_types::TransformIn;
9-
use crate::messages::portfolio::document::node_graph::document_node_definitions::{resolve_document_node_type, DefinitionIdentifier};
9+
use crate::messages::portfolio::document::node_graph::document_node_definitions::{DefinitionIdentifier, resolve_document_node_type};
1010
use crate::messages::portfolio::document::overlays::utility_functions::{path_overlays, selected_segments};
1111
use crate::messages::portfolio::document::overlays::utility_types::{DrawHandles, OverlayContext};
1212
use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;

0 commit comments

Comments
 (0)