Skip to content

Commit 20501ca

Browse files
Ayush2k02Keavon
andauthored
Fix Shape tool layer creation to not make the Transform node to appear after the Stroke node (#3854)
Fix shape stroke thickness remove redundant call Co-authored-by: Keavon Chambers <keavon@keavon.com>
1 parent 4300a88 commit 20501ca

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

editor/src/messages/tool/tool_messages/shape_tool.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,8 +943,6 @@ impl Fsm for ShapeToolFsmState {
943943

944944
let defered_responses = &mut VecDeque::new();
945945

946-
tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
947-
948946
match tool_data.current_shape {
949947
ShapeType::Polygon | ShapeType::Star | ShapeType::Circle | ShapeType::Arc | ShapeType::Spiral | ShapeType::Grid | ShapeType::Rectangle | ShapeType::Ellipse => {
950948
defered_responses.add(GraphOperationMessage::TransformSet {
@@ -954,16 +952,19 @@ impl Fsm for ShapeToolFsmState {
954952
skip_rerender: false,
955953
});
956954

955+
tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
957956
tool_options.fill.apply_fill(layer, defered_responses);
958957
}
959958
ShapeType::Arrow => {
960959
tool_data.line_data.weight = tool_options.line_weight;
961960
tool_data.line_data.editing_layer = Some(layer);
961+
tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
962962
tool_options.fill.apply_fill(layer, defered_responses);
963963
}
964964
ShapeType::Line => {
965965
tool_data.line_data.weight = tool_options.line_weight;
966966
tool_data.line_data.editing_layer = Some(layer);
967+
tool_options.stroke.apply_stroke(tool_options.line_weight, layer, defered_responses);
967968
}
968969
}
969970

0 commit comments

Comments
 (0)