Skip to content

Commit affcd67

Browse files
authored
Merge branch 'master' into Math
2 parents cb81d54 + 1b39e71 commit affcd67

72 files changed

Lines changed: 2169 additions & 1680 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

demo-artwork/changing-seasons.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/isometric-fountain.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/marbled-mandelbrot.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/painted-dreams.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/parametric-dunescape.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/procedural-string-lights.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/red-dress.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo-artwork/valley-of-spires.graphite

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

editor/src/consts.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ pub const MIN_LENGTH_FOR_RESIZE_TO_INCLUDE_INTERIOR: f64 = 40.;
8989
///
9090
/// The motion of the user's cursor by an `x` pixel offset results in `x * scale_factor` pixels of offset on the other side.
9191
pub const MAXIMUM_ALT_SCALE_FACTOR: f64 = 25.;
92+
/// The width or height that the transform cage needs before it is considered to have no width or height.
93+
pub const MAX_LENGTH_FOR_NO_WIDTH_OR_HEIGHT: f64 = 1e-4;
9294

9395
// SKEW TRIANGLES
9496
pub const SKEW_TRIANGLE_SIZE: f64 = 7.;
@@ -100,7 +102,7 @@ pub const MANIPULATOR_GROUP_MARKER_SIZE: f64 = 6.;
100102
pub const SELECTION_THRESHOLD: f64 = 10.;
101103
pub const HIDE_HANDLE_DISTANCE: f64 = 3.;
102104
pub const HANDLE_ROTATE_SNAP_ANGLE: f64 = 15.;
103-
pub const SEGMENT_INSERTION_DISTANCE: f64 = 7.5;
105+
pub const SEGMENT_INSERTION_DISTANCE: f64 = 8.;
104106
pub const SEGMENT_OVERLAY_SIZE: f64 = 10.;
105107
pub const HANDLE_LENGTH_FACTOR: f64 = 0.5;
106108

editor/src/dispatcher.rs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,14 @@ mod test {
498498
println!("-------------------------------------------------");
499499
println!("Failed test due to receiving a DisplayDialogError while loading a Graphite demo file.");
500500
println!();
501+
println!("NOTE:");
502+
println!("Document upgrading isn't performed in tests like when opening in the actual editor.");
503+
println!("You may need to open and re-save a document in the editor to apply its migrations.");
504+
println!();
501505
println!("DisplayDialogError details:");
502506
println!();
503-
println!("Description: {value}");
507+
println!("Description:");
508+
println!("{value}");
504509
println!("-------------------------------------------------");
505510
println!();
506511

@@ -538,7 +543,9 @@ mod test {
538543
});
539544

540545
// Check if the graph renders
541-
editor.eval_graph().await;
546+
if let Err(e) = editor.eval_graph().await {
547+
print_problem_to_terminal_on_failure(&format!("Failed to evaluate the graph for document '{document_name}':\n{e}"));
548+
}
542549

543550
for response in responses {
544551
// Check for the existence of the file format incompatibility warning dialog after opening the test file

0 commit comments

Comments
 (0)