Skip to content

Commit a17ed68

Browse files
committed
Disable snapping by default as a bug mitigation, and assorted cleanup
1 parent 9d749c4 commit a17ed68

File tree

13 files changed

+12
-7986
lines changed

13 files changed

+12
-7986
lines changed

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/just-a-potted-cactus.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/messages/portfolio/document/utility_types/misc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub struct SnappingState {
7272
impl Default for SnappingState {
7373
fn default() -> Self {
7474
Self {
75-
snapping_enabled: true,
75+
snapping_enabled: false, // TODO: Reenable this by default once <https://github.com/GraphiteEditor/Graphite/issues/1817> is fixed
7676
grid_snapping: false,
7777
bounds: Default::default(),
7878
nodes: Default::default(),

node-graph/graphene-cli/test_files/gray.graphite

Lines changed: 0 additions & 1329 deletions
This file was deleted.

node-graph/graphene-cli/test_files/hue.graphite

Lines changed: 0 additions & 1329 deletions
This file was deleted.

node-graph/graphene-cli/test_files/id.graphite

Lines changed: 0 additions & 1329 deletions
This file was deleted.

node-graph/graphene-cli/test_files/invert.graphite

Lines changed: 0 additions & 1329 deletions
This file was deleted.

node-graph/graphene-cli/test_files/levels.graphite

Lines changed: 0 additions & 1329 deletions
This file was deleted.

node-graph/graphene-cli/test_files/vibrance.graphite

Lines changed: 0 additions & 1329 deletions
This file was deleted.

node-graph/gstd/src/any.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,28 +292,28 @@ mod test {
292292
#[should_panic]
293293
pub fn dyn_input_invalid_eval_panic() {
294294
// let add = DynAnyNode::new(AddPairNode::new()).into_type_erased();
295-
// add.eval(Box::new(&("32", 32u32)));
295+
// add.eval(Box::new(&("32", 32_u32)));
296296
let dyn_any = DynAnyNode::<(u32, u32), u32, _>::new(FutureWrapperNode { node: AddPairNode::new() });
297297
let type_erased = Box::new(dyn_any) as TypeErasedBox;
298298
let _ref_type_erased = type_erased.as_ref();
299299
// let type_erased = Box::pin(dyn_any) as TypeErasedBox<'_>;
300-
type_erased.eval(Box::new(&("32", 32u32)));
300+
futures::executor::block_on(type_erased.eval(Box::new(&("32", 32_u32))));
301301
}
302302

303303
#[test]
304304
pub fn dyn_input_compose() {
305305
// let add = DynAnyNode::new(AddPairNode::new()).into_type_erased();
306-
// add.eval(Box::new(&("32", 32u32)));
306+
// add.eval(Box::new(&("32", 32_u32)));
307307
let dyn_any = DynAnyNode::<(u32, u32), u32, _>::new(FutureWrapperNode { node: AddPairNode::new() });
308308
let type_erased = Box::new(dyn_any) as TypeErasedBox<'_>;
309-
type_erased.eval(Box::new((4u32, 2u32)));
309+
futures::executor::block_on(type_erased.eval(Box::new((4_u32, 2_u32))));
310310
let id_node = FutureWrapperNode::new(IdentityNode::new());
311311
let any_id = DynAnyNode::<u32, u32, _>::new(id_node);
312312
let type_erased_id = Box::new(any_id) as TypeErasedBox;
313313
let type_erased = ComposeTypeErased::new(NodeContainer::new(type_erased), NodeContainer::new(type_erased_id));
314-
type_erased.eval(Box::new((4u32, 2u32)));
314+
futures::executor::block_on(type_erased.eval(Box::new((4_u32, 2_u32))));
315315
// let downcast: DowncastBothNode<(u32, u32), u32> = DowncastBothNode::new(type_erased.as_ref());
316-
// downcast.eval((4u32, 2u32));
316+
// downcast.eval((4_u32, 2_u32));
317317
}
318318

319319
// TODO: Fix this test

0 commit comments

Comments
 (0)