Merge branch 'master' into deep-select-fix

Author: Keavon

Cargo.lock

@@ -95,6 +95,9 @@ syn = { version = "2.0", default-features = false, features = [
 	"derive",
 ] }
 kurbo = { version = "0.11.0", features = ["serde"] }
+petgraph = { version = "0.7.1", default-features = false, features = [
+	"graphmap",
+] }
 
 [profile.dev]
 opt-level = 1

Cargo.toml

@@ -47,6 +47,7 @@ ignore = [
 	"RUSTSEC-2024-0388", # Unmaintained but still fully functional crate `derivative`
 	"RUSTSEC-2025-0007", # Unmaintained but still fully functional crate `ring`
 	"RUSTSEC-2024-0436", # Unmaintained but still fully functional crate `paste`
+	"RUSTSEC-2025-0014", # Unmaintained but still fully functional crate `humantime`
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
 # lower than the range specified will be ignored. Note that ignored advisories

demo-artwork/isometric-fountain.graphite

@@ -2,9 +2,9 @@
 name = "graphite-editor"
 publish = false
 version = "0.0.0"
-rust-version = "1.82"
+rust-version = "1.85"
 authors = ["Graphite Authors <contact@graphite.rs>"]
-edition = "2021"
+edition = "2024"
 readme = "../README.md"
 homepage = "https://graphite.rs"
 repository = "https://github.com/GraphiteEditor/Graphite"

deny.toml

@@ -1,6 +1,5 @@
 use crate::dispatcher::Dispatcher;
 use crate::messages::prelude::*;
-
 pub use graphene_core::uuid::*;
 
 // TODO: serialize with serde to save the current editor state

editor/Cargo.toml

@@ -141,14 +141,18 @@ impl Dispatcher {
 					};
 
 					let graphene_std::renderer::RenderMetadata {
-						footprints,
+						upstream_footprints: footprints,
+						local_transforms,
 						click_targets,
 						clip_targets,
 					} = render_metadata;
 
 					// Run these update state messages immediately
 					let messages = [
-						DocumentMessage::UpdateUpstreamTransforms { upstream_transforms: footprints },
+						DocumentMessage::UpdateUpstreamTransforms {
+							upstream_footprints: footprints,
+							local_transforms,
+						},
 						DocumentMessage::UpdateClickTargets { click_targets },
 						DocumentMessage::UpdateClipTargets { clip_targets },
 					];
@@ -299,11 +303,7 @@ impl Dispatcher {
 	fn create_indents(queues: &[VecDeque<Message>]) -> String {
 		String::from_iter(queues.iter().enumerate().skip(1).map(|(index, queue)| {
 			if index == queues.len() - 1 {
-				if queue.is_empty() {
-					"└── "
-				} else {
-					"├── "
-				}
+				if queue.is_empty() { "└── " } else { "├── " }
 			} else if queue.is_empty() {
 				"   "
 			} else {

editor/src/application.rs

@@ -25,7 +25,7 @@
 /// ```
 ///
 macro_rules! actions {
-	($($v:expr),* $(,)?) => {{
+	($($v:expr_2021),* $(,)?) => {{
 		vec![$(vec![$v.into()]),*]
 	}};
 
@@ -42,7 +42,7 @@ macro_rules! actions {
 /// }
 /// ```
 macro_rules! advertise_actions {
-	($($v:expr),* $(,)?) => {
+	($($v:expr_2021),* $(,)?) => {
 		fn actions(&self) -> $crate::utility_traits::ActionList {
 			actions!($($v),*)
 		}

editor/src/dispatcher.rs

@@ -1,9 +1,7 @@
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
-
-use graph_craft::document::NodeId;
-
 use glam::{IVec2, UVec2};
+use graph_craft::document::NodeId;
 
 /// A dialog to allow users to set some initial options about a new document.
 #[derive(Debug, Clone, Default)]

editor/src/macros.rs

@@ -26,16 +26,18 @@ impl LayoutHolder for ComingSoonDialog {
 
 		if let Some(issue) = self.issue {
 			let row2 = vec![TextLabel::new("But you can help build it! Visit its issue:").widget_holder()];
-			let row3 = vec![TextButton::new(format!("GitHub Issue #{issue}"))
-				.icon(Some("Website".into()))
-				.flush(true)
-				.on_update(move |_| {
-					FrontendMessage::TriggerVisitLink {
-						url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
-					}
-					.into()
-				})
-				.widget_holder()];
+			let row3 = vec![
+				TextButton::new(format!("GitHub Issue #{issue}"))
+					.icon(Some("Website".into()))
+					.flush(true)
+					.on_update(move |_| {
+						FrontendMessage::TriggerVisitLink {
+							url: format!("https://github.com/GraphiteEditor/Graphite/issues/{issue}"),
+						}
+						.into()
+					})
+					.widget_holder(),
+			];
 
 			rows.push(LayoutGroup::Row { widgets: row2 });
 			rows.push(LayoutGroup::Row { widgets: row3 });

editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs

@@ -32,11 +32,13 @@ impl LayoutHolder for DemoArtworkDialog {
 			.flat_map(|chunk| {
 				fn make_dialog(name: &str, filename: &str) -> Message {
 					DialogMessage::CloseDialogAndThen {
-						followups: vec![FrontendMessage::TriggerFetchAndOpenDocument {
-							name: name.to_string(),
-							filename: filename.to_string(),
-						}
-						.into()],
+						followups: vec![
+							FrontendMessage::TriggerFetchAndOpenDocument {
+								name: name.to_string(),
+								filename: filename.to_string(),
+							}
+							.into(),
+						],
 					}
 					.into()
 				}

editor/src/messages/dialog/simple_dialogs/coming_soon_dialog.rs

@@ -10,8 +10,7 @@ pub use about_graphite_dialog::AboutGraphiteDialog;
 pub use close_all_documents_dialog::CloseAllDocumentsDialog;
 pub use close_document_dialog::CloseDocumentDialog;
 pub use coming_soon_dialog::ComingSoonDialog;
+pub use demo_artwork_dialog::ARTWORK;
 pub use demo_artwork_dialog::DemoArtworkDialog;
 pub use error_dialog::ErrorDialog;
 pub use licenses_dialog::LicensesDialog;
-
-pub use demo_artwork_dialog::ARTWORK;

editor/src/messages/dialog/simple_dialogs/demo_artwork_dialog.rs

@@ -6,7 +6,6 @@ use crate::messages::portfolio::document::node_graph::utility_types::{
 use crate::messages::portfolio::document::utility_types::nodes::{JsRawBuffer, LayerPanelEntry, RawBuffer};
 use crate::messages::prelude::*;
 use crate::messages::tool::utility_types::HintData;
-
 use graph_craft::document::NodeId;
 use graphene_core::raster::color::Color;
 use graphene_core::text::Font;

editor/src/messages/dialog/simple_dialogs/mod.rs

@@ -1,5 +1,4 @@
 use crate::messages::portfolio::utility_types::Platform;
-
 use std::sync::OnceLock;
 
 pub static GLOBAL_PLATFORM: OnceLock<Platform> = OnceLock::new();

editor/src/messages/frontend/frontend_message.rs

@@ -3,7 +3,6 @@ use super::utility_types::misc::Mapping;
 use crate::messages::input_mapper::utility_types::input_keyboard::{self, Key};
 use crate::messages::portfolio::utility_types::KeyboardPlatformLayout;
 use crate::messages::prelude::*;
-
 use std::fmt::Write;
 
 pub struct InputMapperMessageData<'a> {

editor/src/messages/globals/global_variables.rs

@@ -11,7 +11,6 @@ use crate::messages::portfolio::document::utility_types::misc::GroupFolderType;
 use crate::messages::prelude::*;
 use crate::messages::tool::tool_messages::brush_tool::BrushToolMessageOptionsUpdate;
 use crate::messages::tool::tool_messages::select_tool::SelectToolPointerKeys;
-
 use glam::DVec2;
 
 impl From<MappingVariant> for Mapping {
@@ -157,9 +156,9 @@ pub fn input_mappings() -> Mapping {
 		entry!(PointerMove; refresh_keys=[Alt, Shift], action_dispatch=TextToolMessage::PointerMove { center: Alt, lock_ratio: Shift }),
 		entry!(KeyDown(MouseLeft); action_dispatch=TextToolMessage::DragStart),
 		entry!(KeyUp(MouseLeft); action_dispatch=TextToolMessage::DragStop),
-		entry!(KeyDown(MouseRight); action_dispatch=TextToolMessage::CommitText),
-		entry!(KeyDown(Escape); action_dispatch=TextToolMessage::CommitText),
-		entry!(KeyDown(Enter); modifiers=[Accel], action_dispatch=TextToolMessage::CommitText),
+		entry!(KeyDown(MouseRight); action_dispatch=TextToolMessage::Abort),
+		entry!(KeyDown(Escape); action_dispatch=TextToolMessage::Abort),
+		entry!(KeyDown(Enter); modifiers=[Accel], action_dispatch=TextToolMessage::Abort),
 		//
 		// GradientToolMessage
 		entry!(KeyDown(MouseLeft); action_dispatch=GradientToolMessage::PointerDown),
@@ -253,7 +252,7 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(KeyJ); modifiers=[Accel], action_dispatch=ToolMessage::Path(PathToolMessage::ClosePath)),
 		//
 		// PenToolMessage
-		entry!(PointerMove; refresh_keys=[Control, Alt, Shift, KeyC], action_dispatch=PenToolMessage::PointerMove { snap_angle: Shift, break_handle: Alt, lock_angle: Control, colinear: KeyC }),
+		entry!(PointerMove; refresh_keys=[Control, Alt, Shift, KeyC], action_dispatch=PenToolMessage::PointerMove { snap_angle: Shift, break_handle: Alt, lock_angle: Control, colinear: KeyC, move_anchor_with_handles: Space }),
 		entry!(KeyDown(MouseLeft); action_dispatch=PenToolMessage::DragStart { append_to_selected: Shift }),
 		entry!(KeyUp(MouseLeft); action_dispatch=PenToolMessage::DragStop),
 		entry!(KeyDown(MouseRight); action_dispatch=PenToolMessage::Confirm),

editor/src/messages/input_mapper/input_mapper_message_handler.rs

@@ -1,8 +1,6 @@
 use crate::messages::portfolio::utility_types::KeyboardPlatformLayout;
 use crate::messages::prelude::*;
-
 use bitflags::bitflags;
-
 use std::fmt::{self, Display, Formatter};
 use std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign};
 

editor/src/messages/input_mapper/input_mappings.rs

@@ -1,6 +1,5 @@
 use crate::consts::DRAG_THRESHOLD;
 use crate::messages::prelude::*;
-
 use bitflags::bitflags;
 use glam::DVec2;
 use std::collections::VecDeque;

editor/src/messages/input_mapper/utility_types/input_keyboard.rs

@@ -24,7 +24,7 @@ macro_rules! modifiers {
 /// Each handler adds or removes actions in the form of message discriminants. Here, we tie an input condition (such as a hotkey) to an action's full message.
 /// When an action is currently available, and the user enters that input, the action's message is dispatched on the message bus.
 macro_rules! entry {
-	($input:expr; $(modifiers=[$($modifier:ident),*],)? $(refresh_keys=[$($refresh:ident),* $(,)?],)? action_dispatch=$action_dispatch:expr$(,)?) => {
+	($input:expr_2021; $(modifiers=[$($modifier:ident),*],)? $(refresh_keys=[$($refresh:ident),* $(,)?],)? action_dispatch=$action_dispatch:expr_2021$(,)?) => {
 		&[&[
 			// Cause the `action_dispatch` message to be sent when the specified input occurs.
 			MappingEntry {
@@ -72,7 +72,7 @@ macro_rules! entry {
 /// (key_up, key_down, double_click, wheel_scroll, pointer_move)
 /// ```
 macro_rules! mapping {
-	[$($entry:expr),* $(,)?] => {{
+	[$($entry:expr_2021),* $(,)?] => {{
 		let mut key_up = KeyMappingEntries::key_array();
 		let mut key_down = KeyMappingEntries::key_array();
 		let mut key_up_no_repeat = KeyMappingEntries::key_array();
@@ -107,7 +107,7 @@ macro_rules! mapping {
 
 /// Constructs an `ActionKeys` macro with a certain `Action` variant, conveniently wrapped in `Some()`.
 macro_rules! action_keys {
-	($action:expr) => {
+	($action:expr_2021) => {
 		Some(crate::messages::input_mapper::utility_types::misc::ActionKeys::Action($action.into()))
 	};
 }

editor/src/messages/input_mapper/utility_types/input_mouse.rs

@@ -1,9 +1,8 @@
-use super::input_keyboard::{all_required_modifiers_pressed, Key, KeysGroup, LayoutKeysGroup};
+use super::input_keyboard::{Key, KeysGroup, LayoutKeysGroup, all_required_modifiers_pressed};
 use crate::messages::input_mapper::key_mapping::MappingVariant;
 use crate::messages::input_mapper::utility_types::input_keyboard::{KeyStates, NUMBER_OF_KEYS};
 use crate::messages::input_mapper::utility_types::input_mouse::NUMBER_OF_MOUSE_BUTTONS;
 use crate::messages::prelude::*;
-
 use core::time::Duration;
 
 #[derive(Debug, Clone)]

editor/src/messages/input_mapper/utility_types/macros.rs

@@ -1,7 +1,6 @@
 use crate::messages::input_mapper::utility_types::input_keyboard::{Key, ModifierKeys};
 use crate::messages::input_mapper::utility_types::input_mouse::{EditorMouseState, ViewportBounds};
 use crate::messages::prelude::*;
-
 use core::time::Duration;
 
 #[impl_message(Message, InputPreprocessor)]

editor/src/messages/input_mapper/utility_types/misc.rs

@@ -3,7 +3,6 @@ use crate::messages::input_mapper::utility_types::input_mouse::{MouseButton, Mou
 use crate::messages::input_mapper::utility_types::misc::FrameTimeInfo;
 use crate::messages::portfolio::utility_types::KeyboardPlatformLayout;
 use crate::messages::prelude::*;
-
 use glam::DVec2;
 
 pub struct InputPreprocessorMessageData {

editor/src/messages/input_preprocessor/input_preprocessor_message.rs

@@ -1,11 +1,9 @@
 use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
-
 use graphene_core::raster::color::Color;
 use graphene_core::text::Font;
 use graphene_std::vector::style::{FillChoice, GradientStops};
-
 use serde_json::Value;
 
 #[derive(Debug, Clone, Default)]

editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

@@ -6,7 +6,6 @@ use crate::application::generate_uuid;
 use crate::messages::input_mapper::utility_types::input_keyboard::KeysGroup;
 use crate::messages::input_mapper::utility_types::misc::ActionKeys;
 use crate::messages::prelude::*;
-
 use std::sync::Arc;
 
 #[repr(transparent)]
@@ -348,11 +347,7 @@ impl LayoutGroup {
 				val.clone_from(&tooltip);
 			}
 		}
-		if is_col {
-			Self::Column { widgets }
-		} else {
-			Self::Row { widgets }
-		}
+		if is_col { Self::Column { widgets } } else { Self::Row { widgets } }
 	}
 
 	/// Diffing updates self (where self is old) based on new, updating the list of modifications as it does so.

editor/src/messages/layout/layout_message_handler.rs

@@ -2,12 +2,10 @@ use crate::messages::input_mapper::utility_types::misc::ActionKeys;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::node_graph::utility_types::FrontendGraphDataType;
 use crate::messages::tool::tool_messages::tool_prelude::WidgetCallback;
-
+use derivative::*;
 use graphene_std::vector::style::FillChoice;
 use graphite_proc_macros::WidgetBuilder;
 
-use derivative::*;
-
 #[derive(Clone, Default, Derivative, serde::Serialize, serde::Deserialize, WidgetBuilder, specta::Type)]
 #[derivative(Debug, PartialEq)]
 pub struct IconButton {