mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-07-08 00:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make the Transform node's skew parameter input actually in degrees (#2431)

Browse source 
* Make skew actually in degrees

* Add min and max

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
James Lindsay 2025-03-14 11:27:18 +00:00 • committed by GitHub
parent 3e56113c78
commit 5cdcc37379
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

56
editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs
View file

@ -2252,15 +2252,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
..Default::default()
}),
),
PropertiesRow::with_override(
"Skew",
WidgetOverride::Vec2(Vec2InputSettings {
x: "X".to_string(),
y: "Y".to_string(),
unit: "°".to_string(),
..Default::default()
}),
),
PropertiesRow::with_override("Skew", WidgetOverride::Custom("transform_skew".to_string())),
PropertiesRow::with_override("Pivot", WidgetOverride::Hidden),
],
output_names: vec!["Data".to_string()],
@ -3360,6 +3352,52 @@ fn static_input_properties() -> InputProperties {
Ok(vec![LayoutGroup::Row { widgets }])
}),
);
// Skew has a custom override that maps to degrees
map.insert(
"transform_skew".to_string(),
Box::new(|node_id, index, context| {
let (document_node, input_name) = node_properties::query_node_and_input_name(node_id, index, context)?;
let mut widgets = node_properties::start_widgets(document_node, node_id, index, input_name, super::utility_types::FrontendGraphDataType::Number, true);
let Some(input) = document_node.inputs.get(index) else {
return Err("Input not found in transform skew input override".to_string());
};
if let Some(&TaggedValue::DVec2(val)) = input.as_non_exposed_value() {
let to_skew = |input: &NumberInput| input.value.unwrap().to_radians().tan();
widgets.extend_from_slice(&[
Separator::new(SeparatorType::Unrelated).widget_holder(),
NumberInput::new(Some(val.x.atan().to_degrees()))
.label("X")
.unit("°")
.min(-89.9)
.max(89.9)
.on_update(node_properties::update_value(
move |input: &NumberInput| TaggedValue::DVec2(DVec2::new(to_skew(input), val.y)),
node_id,
index,
))
.on_commit(node_properties::commit_value)
.widget_holder(),
Separator::new(SeparatorType::Related).widget_holder(),
NumberInput::new(Some(val.y.atan().to_degrees()))
.label("Y")
.unit("°")
.min(-89.9)
.max(89.9)
.on_update(node_properties::update_value(
move |input: &NumberInput| TaggedValue::DVec2(DVec2::new(val.x, to_skew(input))),
node_id,
index,
))
.on_commit(node_properties::commit_value)
.widget_holder(),
]);
}
Ok(vec![LayoutGroup::Row { widgets }])
}),
);
map.insert(
"text_area".to_string(),
Box::new(|node_id, index, context| {