Skip to content

Fix crash when scaling something with 0 width or height #1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keavon merged 4 commits into from
Mar 26, 2023
+4 −1
Merged

Fix crash when scaling something with 0 width or height #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66c9e33
resolve NaN value when trying to change scale value from zero to othe…
Mar 15, 2023
af952f6
resolve NaN value when trying to change scale value from zero to othe…
Mar 15, 2023
b1d0329
Merge branch 'master' into zero-scale-error
Sahra-Zhou Mar 21, 2023
0819537
Merge branch 'master' into zero-scale-error
Keavon Mar 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion document-legacy/src/layers/shape_layer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ impl LayerData for ShapeLayer {

fn bounding_box(&self, transform: glam::DAffine2, _render_data: &RenderData) -> Option<[DVec2; 2]> {
let mut subpath = self.shape.clone();
if transform.matrix2 == DMat2::ZERO {
if transform.matrix2 == DMat2::ZERO || !transform.is_finite() {
return None;
}
subpath.apply_affine(transform);
Expand Down
3 changes: 3 additions & 0 deletions editor/src/messages/portfolio/document/properties_panel/utility_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ pub fn apply_transform_operation(layer: &Layer, transform_op: TransformOp, value

// Find the delta transform
let mut delta = layer.transform.inverse() * transform;
if !delta.is_finite() {
return layer.transform.to_cols_array();
}

// Preserve aspect ratio
if matches!(transform_op, TransformOp::ScaleX | TransformOp::Width) && layer.preserve_aspect {
Expand Down