Add transform cage to textbox while using Text tool

editor/src/messages/input_mapper/input_mappings.rs

@@ -157,9 +157,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),

editor/src/messages/portfolio/document/utility_types/network_interface.rs

@@ -3806,7 +3806,6 @@ impl NodeNetworkInterface {
 			log::error!("Cannot connect a network to an export, see https://github.com/GraphiteEditor/Graphite/issues/1762");
 			return;
 		}
-
 		let Some(previous_input) = self.input_from_connector(input_connector, network_path).cloned() else {
 			log::error!("Could not get previous input in set_input");
 			return;

editor/src/messages/tool/common_functionality/pivot.rs

@@ -83,6 +83,16 @@ impl Pivot {
 		}
 	}
 
+	pub fn update_box_pivot(&mut self, normalized_pivot: DVec2, layer_transform: DAffine2, bounds_transform: DAffine2, overlay_context: &mut OverlayContext) {
+		self.normalized_pivot = normalized_pivot;
+		self.transform_from_normalized = layer_transform * bounds_transform;
+
+		self.pivot = Some(self.transform_from_normalized.transform_point2(normalized_pivot));
+		if let Some(pivot) = self.pivot {
+			overlay_context.pivot(pivot);
+		}
+	}
+
 	pub fn update_pivot(&mut self, document: &DocumentMessageHandler, overlay_context: &mut OverlayContext) {
 		self.recalculate_pivot(document);
 		if let Some(pivot) = self.pivot {

editor/src/messages/tool/common_functionality/utility_functions.rs

@@ -1,6 +1,9 @@
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::*;
+use crate::messages::tool::common_functionality::graph_modification_utils::get_text;
 
+use graphene_core::renderer::Quad;
+use graphene_core::text::{load_face, FontCache};
 use graphene_std::vector::PointId;
 
 use glam::DVec2;
@@ -53,3 +56,13 @@ where
 
 	best
 }
+
+/// Calculates the bounding box of the layer's text, based on the settings for max width and height specified in the typesetting config.
+pub fn text_bounding_box(layer: LayerNodeIdentifier, document: &DocumentMessageHandler, font_cache: &FontCache) -> Quad {
+	let (text, font, typesetting) = get_text(layer, &document.network_interface).expect("Text layer should have text when interacting with the Text tool");
+
+	let buzz_face = font_cache.get(font).map(|data| load_face(data));
+	let far = graphene_core::text::bounding_box(text, buzz_face.as_ref(), typesetting);
+
+	Quad::from_box([DVec2::ZERO, far])
+}

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

@@ -11,17 +11,17 @@ use crate::messages::portfolio::document::utility_types::network_interface::{Flo
 use crate::messages::portfolio::document::utility_types::nodes::SelectedNodes;
 use crate::messages::portfolio::document::utility_types::transformation::Selected;
 use crate::messages::preferences::SelectionMode;
-use crate::messages::tool::common_functionality::graph_modification_utils::{get_text, is_layer_fed_by_node_of_name};
+use crate::messages::tool::common_functionality::graph_modification_utils::is_layer_fed_by_node_of_name;
 use crate::messages::tool::common_functionality::pivot::Pivot;
 use crate::messages::tool::common_functionality::shape_editor::SelectionShapeType;
 use crate::messages::tool::common_functionality::snapping::{self, SnapCandidatePoint, SnapData, SnapManager};
 use crate::messages::tool::common_functionality::transformation_cage::*;
+use crate::messages::tool::common_functionality::utility_functions::text_bounding_box;
 use crate::messages::tool::common_functionality::{auto_panning::AutoPanning, measure};
 
 use bezier_rs::Subpath;
 use graph_craft::document::NodeId;
 use graphene_core::renderer::Quad;
-use graphene_core::text::load_face;
 use graphene_std::renderer::Rect;
 use graphene_std::vector::misc::BooleanOperation;
 
@@ -494,14 +494,8 @@ impl Fsm for SelectToolFsmState {
 					overlay_context.outline(document.metadata().layer_outline(layer), document.metadata().transform_to_viewport(layer));
 
 					if is_layer_fed_by_node_of_name(layer, &document.network_interface, "Text") {
-						let (text, font, typesetting) = get_text(layer, &document.network_interface).expect("Text layer should have text when interacting with the Text tool in `interact()`");
-
-						let buzz_face = font_cache.get(font).map(|data| load_face(data));
-						let far = graphene_core::text::bounding_box(text, buzz_face, typesetting);
-						let quad = Quad::from_box([DVec2::ZERO, far]);
-						let transformed_quad = document.metadata().transform_to_viewport(layer) * quad;
-
-						overlay_context.dashed_quad(transformed_quad, None, Some(4.), Some(4.), Some(0.5));
+						let transformed_quad = document.metadata().transform_to_viewport(layer) * text_bounding_box(layer, document, font_cache);
+						overlay_context.dashed_quad(transformed_quad, None, Some(7.), Some(5.), None);
 					}
 				}