fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-10-01 04:38:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

make it compile

Browse Source
This commit is contained in:
0SlowPoke0
2025-07-10 16:25:51 +05:30
parent 57437a9bdb
commit 8870409b87
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/portfolio/document/node_graph/node_properties.rs
+12 -23
View File
@@ -1205,6 +1205,12 @@ pub(crate) fn grid_properties(node_id: NodeId, context: &mut NodePropertiesConte
pub(crate) fn spiral_properties(node_id: NodeId, context: &mut NodePropertiesContext) -> Vec<LayoutGroup> { pub(crate) fn spiral_properties(node_id: NodeId, context: &mut NodePropertiesContext) -> Vec<LayoutGroup> {
use graphene_std::vector::generator_nodes::spiral::*; use graphene_std::vector::generator_nodes::spiral::*;
let spiral_type = enum_choice::<SpiralType>()
.for_socket(ParameterWidgetsInfo::new(node_id, SpiralTypeInput::INDEX, true, context))
.property_row();
let mut widgets = vec![spiral_type];
let document_node = match get_document_node(node_id, context) { let document_node = match get_document_node(node_id, context) {
Ok(document_node) => document_node, Ok(document_node) => document_node,
Err(err) => { Err(err) => {
@@ -1212,11 +1218,6 @@ pub(crate) fn spiral_properties(node_id: NodeId, context: &mut NodePropertiesCon
return Vec::new(); return Vec::new();
} }
}; };
let spiral_type = enum_choice::<SpiralType>()
.for_socket(ParameterWidgetsInfo::from_index(document_node, node_id, SpiralTypeInput::INDEX, true, context))
.property_row();
let mut widgets = vec![spiral_type];
let Some(spiral_type_input) = document_node.inputs.get(SpiralTypeInput::INDEX) else { let Some(spiral_type_input) = document_node.inputs.get(SpiralTypeInput::INDEX) else {
log::warn!("A widget failed to be built because its node's input index is invalid."); log::warn!("A widget failed to be built because its node's input index is invalid.");
@@ -1226,32 +1227,23 @@ pub(crate) fn spiral_properties(node_id: NodeId, context: &mut NodePropertiesCon
match spiral_type { match spiral_type {
SpiralType::Archimedean => { SpiralType::Archimedean => {
let inner_radius = LayoutGroup::Row { let inner_radius = LayoutGroup::Row {
widgets: number_widget( widgets: number_widget(ParameterWidgetsInfo::new(node_id, InnerRadiusInput::INDEX, true, context), NumberInput::default().min(0.)),
ParameterWidgetsInfo::from_index(document_node, node_id, InnerRadiusInput::INDEX, true, context),
NumberInput::default().min(0.),
),
}; };
let tightness = LayoutGroup::Row { let tightness = LayoutGroup::Row {
widgets: number_widget( widgets: number_widget(ParameterWidgetsInfo::new(node_id, TightnessInput::INDEX, true, context), NumberInput::default().unit(" px")),
ParameterWidgetsInfo::from_index(document_node, node_id, TightnessInput::INDEX, true, context),
NumberInput::default().unit(" px"),
),
}; };
widgets.extend([inner_radius, tightness]); widgets.extend([inner_radius, tightness]);
} }
SpiralType::Logarithmic => { SpiralType::Logarithmic => {
let start_radius = LayoutGroup::Row { let start_radius = LayoutGroup::Row {
widgets: number_widget( widgets: number_widget(ParameterWidgetsInfo::new(node_id, StartRadiusInput::INDEX, true, context), NumberInput::default().min(0.)),
ParameterWidgetsInfo::from_index(document_node, node_id, StartRadiusInput::INDEX, true, context),
NumberInput::default().min(0.001),
),
}; };
let growth = LayoutGroup::Row { let growth = LayoutGroup::Row {
widgets: number_widget( widgets: number_widget(
ParameterWidgetsInfo::from_index(document_node, node_id, GrowthInput::INDEX, true, context), ParameterWidgetsInfo::new(node_id, GrowthInput::INDEX, true, context),
NumberInput::default().max(0.5).min(0.1).increment_behavior(NumberInputIncrementBehavior::Add).increment_step(0.01), NumberInput::default().max(0.5).min(0.1).increment_behavior(NumberInputIncrementBehavior::Add).increment_step(0.01),
), ),
}; };
@@ -1261,12 +1253,9 @@ pub(crate) fn spiral_properties(node_id: NodeId, context: &mut NodePropertiesCon
} }
} }
let turns = number_widget( let turns = number_widget(ParameterWidgetsInfo::new(node_id, TurnsInput::INDEX, true, context), NumberInput::default().min(0.1));
ParameterWidgetsInfo::from_index(document_node, node_id, TurnsInput::INDEX, true, context),
NumberInput::default().min(0.1),
);
let angle_offset = number_widget( let angle_offset = number_widget(
ParameterWidgetsInfo::from_index(document_node, node_id, AngleOffsetInput::INDEX, true, context), ParameterWidgetsInfo::new(node_id, AngleOffsetInput::INDEX, true, context),
NumberInput::default().min(0.1).max(180.).unit("°"), NumberInput::default().min(0.1).max(180.).unit("°"),
); );