Implement the Text Tool and text layer MVP

editor/src/document/document_message.rs

@@ -115,6 +115,10 @@ pub enum DocumentMessage {
 	SetSnapping {
 		snap: bool,
 	},
+	SetTexboxEditability {
+		path: Vec<LayerId>,
+		editable: bool,
+	},
 	SetViewMode {
 		view_mode: ViewMode,
 	},

editor/src/document/document_message_handler.rs

@@ -1,5 +1,5 @@
 use super::clipboards::Clipboard;
-use super::layer_panel::{layer_panel_entry, LayerMetadata, LayerPanelEntry, RawBuffer};
+use super::layer_panel::{layer_panel_entry, LayerDataTypeDiscriminant, LayerMetadata, LayerPanelEntry, RawBuffer};
 use super::utility_types::{AlignAggregate, AlignAxis, DocumentSave, FlipAxis, VectorManipulatorSegment, VectorManipulatorShape};
 use super::vectorize_layer_metadata;
 use super::{ArtboardMessageHandler, MovementMessageHandler, OverlaysMessageHandler, TransformLayerMessageHandler};
@@ -146,11 +146,11 @@ impl DocumentMessageHandler {
 				_ => return None,
 			};
 
-			let shape = match &layer.ok()?.data {
-				LayerDataType::Shape(shape) => Some(shape),
-				LayerDataType::Folder(_) => None,
+			let (path, closed) = match &layer.ok()?.data {
+				LayerDataType::Shape(shape) => Some((shape.path.clone(), shape.closed)),
+				LayerDataType::Text(text) => Some((text.to_bez_path_nonmut(), true)),
+				_ => None,
 			}?;
-			let path = shape.path.clone();
 
 			let segments = path
 				.segments()
@@ -170,7 +170,7 @@ impl DocumentMessageHandler {
 				path,
 				segments,
 				transform: viewport_transform,
-				closed: shape.closed,
+				closed,
 			})
 		});
 
@@ -204,6 +204,16 @@ impl DocumentMessageHandler {
 		})
 	}
 
+	pub fn selected_visible_text_layers(&self) -> impl Iterator<Item = &[LayerId]> {
+		self.selected_layers().filter(|path| match self.graphene_document.layer(path) {
+			Ok(layer) => {
+				let discriminant: LayerDataTypeDiscriminant = (&layer.data).into();
+				layer.visible && discriminant == LayerDataTypeDiscriminant::Text
+			}
+			Err(_) => false,
+		})
+	}
+
 	pub fn visible_layers(&self) -> impl Iterator<Item = &[LayerId]> {
 		self.all_layers().filter(|path| match self.graphene_document.layer(path) {
 			Ok(layer) => layer.visible,
@@ -216,17 +226,14 @@ impl DocumentMessageHandler {
 		for (id, layer) in folder.layer_ids.iter().zip(folder.layers()).rev() {
 			data.push(*id);
 			space += 1;
-			match layer.data {
-				LayerDataType::Shape(_) => (),
-				LayerDataType::Folder(ref folder) => {
-					path.push(*id);
-					if self.layer_metadata(path).expanded {
-						structure.push(space);
-						self.serialize_structure(folder, structure, data, path);
-						space = 0;
-					}
-					path.pop();
+			if let LayerDataType::Folder(ref folder) = layer.data {
+				path.push(*id);
+				if self.layer_metadata(path).expanded {
+					structure.push(space);
+					self.serialize_structure(folder, structure, data, path);
+					space = 0;
 				}
+				path.pop();
 			}
 		}
 		structure.push(space | 1 << 63);
@@ -962,6 +969,22 @@ impl MessageHandler<DocumentMessage, &InputPreprocessorMessageHandler> for Docum
 			SetSnapping { snap } => {
 				self.snapping_enabled = snap;
 			}
+			SetTexboxEditability { path, editable } => {
+				let text = self.graphene_document.layer(&path).unwrap().as_text().unwrap();
+				responses.push_back(DocumentOperation::SetTextEditability { path, editable }.into());
+				if editable {
+					responses.push_back(
+						FrontendMessage::DisplayEditableTextbox {
+							text: text.text.clone(),
+							line_width: text.line_width,
+							font_size: text.size,
+						}
+						.into(),
+					);
+				} else {
+					responses.push_back(FrontendMessage::DisplayRemoveEditableTextbox.into());
+				}
+			}
 			SetViewMode { view_mode } => {
 				self.view_mode = view_mode;
 				responses.push_front(DocumentMessage::DirtyRenderDocument.into());

editor/src/document/layer_panel.rs

@@ -97,13 +97,15 @@ pub struct LayerPanelEntry {
 pub enum LayerDataTypeDiscriminant {
 	Folder,
 	Shape,
+	Text,
 }
 
 impl fmt::Display for LayerDataTypeDiscriminant {
 	fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
 		let name = match self {
 			LayerDataTypeDiscriminant::Folder => "Folder",
 			LayerDataTypeDiscriminant::Shape => "Shape",
+			LayerDataTypeDiscriminant::Text => "Text",
 		};
 
 		formatter.write_str(name)
@@ -117,6 +119,7 @@ impl From<&LayerDataType> for LayerDataTypeDiscriminant {
 		match data {
 			Folder(_) => LayerDataTypeDiscriminant::Folder,
 			Shape(_) => LayerDataTypeDiscriminant::Shape,
+			Text(_) => LayerDataTypeDiscriminant::Text,
 		}
 	}
 }

editor/src/frontend/frontend_message.rs

@@ -18,12 +18,15 @@ pub enum FrontendMessage {
 	DisplayDialogError { title: String, description: String },
 	DisplayDialogPanic { panic_info: String, title: String, description: String },
 	DisplayDocumentLayerTreeStructure { data_buffer: RawBuffer },
+	DisplayEditableTextbox { text: String, line_width: Option<f64>, font_size: f64 },
+	DisplayRemoveEditableTextbox,
 
 	// Trigger prefix: cause a browser API to do something
 	TriggerFileDownload { document: String, name: String },
 	TriggerFileUpload,
 	TriggerIndexedDbRemoveDocument { document_id: u64 },
 	TriggerIndexedDbWriteDocument { document: String, details: FrontendDocumentDetails, version: String },
+	TriggerTextCommit,
 
 	// Update prefix: give the frontend a new value or state for it to use
 	UpdateActiveDocument { document_id: u64 },

editor/src/frontend/utility_types.rs

@@ -14,4 +14,5 @@ pub enum MouseCursorIcon {
 	ZoomOut,
 	Grabbing,
 	Crosshair,
+	Text,
 }

editor/src/input/input_mapper.rs

@@ -14,6 +14,7 @@ pub struct Mapping {
 	pub key_down: [KeyMappingEntries; NUMBER_OF_KEYS],
 	pub pointer_move: KeyMappingEntries,
 	pub mouse_scroll: KeyMappingEntries,
+	pub double_click: KeyMappingEntries,
 }
 
 impl Default for Mapping {
@@ -44,6 +45,7 @@ impl Default for Mapping {
 			entry! {action=SelectMessage::MouseMove { snap_angle: KeyShift }, message=InputMapperMessage::PointerMove},
 			entry! {action=SelectMessage::DragStart { add_to_selection: KeyShift }, key_down=Lmb},
 			entry! {action=SelectMessage::DragStop, key_up=Lmb},
+			entry! {action=SelectMessage::EditText, message=InputMapperMessage::DoubleClick},
 			entry! {action=SelectMessage::Abort, key_down=Rmb},
 			entry! {action=SelectMessage::Abort, key_down=KeyEscape},
 			// Navigate
@@ -59,6 +61,10 @@ impl Default for Mapping {
 			// Eyedropper
 			entry! {action=EyedropperMessage::LeftMouseDown, key_down=Lmb},
 			entry! {action=EyedropperMessage::RightMouseDown, key_down=Rmb},
+			// Text
+			entry! {action=TextMessage::Interact, key_up=Lmb},
+			entry! {action=TextMessage::Abort, key_down=KeyEscape},
+			entry! {action=TextMessage::CommitText, key_down=KeyEnter, modifiers=[KeyControl]},
 			// Rectangle
 			entry! {action=RectangleMessage::DragStart, key_down=Lmb},
 			entry! {action=RectangleMessage::DragStop, key_up=Lmb},
@@ -105,6 +111,7 @@ impl Default for Mapping {
 			entry! {action=ToolMessage::ActivateTool { tool_type: ToolType::Select }, key_down=KeyV},
 			entry! {action=ToolMessage::ActivateTool { tool_type: ToolType::Navigate }, key_down=KeyZ},
 			entry! {action=ToolMessage::ActivateTool { tool_type: ToolType::Eyedropper }, key_down=KeyI},
+			entry! {action=ToolMessage::ActivateTool { tool_type: ToolType::Text }, key_down=KeyT},
 			entry! {action=ToolMessage::ActivateTool { tool_type: ToolType::Fill }, key_down=KeyF},
 			entry! {action=ToolMessage::ActivateTool { tool_type: ToolType::Path }, key_down=KeyA},
 			entry! {action=ToolMessage::ActivateTool { tool_type: ToolType::Pen }, key_down=KeyP},
@@ -203,7 +210,7 @@ impl Default for Mapping {
 			entry! {action=GlobalMessage::LogDebug, key_down=Key2},
 			entry! {action=GlobalMessage::LogTrace, key_down=Key3},
 		];
-		let (mut key_up, mut key_down, mut pointer_move, mut mouse_scroll) = mappings;
+		let (mut key_up, mut key_down, mut pointer_move, mut mouse_scroll, mut double_click) = mappings;
 
 		// TODO: Hardcode these 10 lines into 10 lines of declarations, or make this use a macro to do all 10 in one line
 		const NUMBER_KEYS: [Key; 10] = [Key0, Key1, Key2, Key3, Key4, Key5, Key6, Key7, Key8, Key9];
@@ -226,12 +233,14 @@ impl Default for Mapping {
 		}
 		sort(&mut pointer_move);
 		sort(&mut mouse_scroll);
+		sort(&mut double_click);
 
 		Self {
 			key_up,
 			key_down,
 			pointer_move,
 			mouse_scroll,
+			double_click,
 		}
 	}
 }
@@ -243,6 +252,7 @@ impl Mapping {
 		let list = match message {
 			KeyDown(key) => &self.key_down[key as usize],
 			KeyUp(key) => &self.key_up[key as usize],
+			DoubleClick => &self.double_click,
 			MouseScroll => &self.mouse_scroll,
 			PointerMove => &self.pointer_move,
 		};
@@ -331,18 +341,20 @@ mod input_mapper_macros {
 			let mut key_down = KeyMappingEntries::key_array();
 			let mut pointer_move: KeyMappingEntries = Default::default();
 			let mut mouse_scroll: KeyMappingEntries = Default::default();
+			let mut double_click: KeyMappingEntries = Default::default();
 			$(
 				for entry in $entry {
 					let arr = match entry.trigger {
 						InputMapperMessage::KeyDown(key) => &mut key_down[key as usize],
 						InputMapperMessage::KeyUp(key) => &mut key_up[key as usize],
 						InputMapperMessage::MouseScroll => &mut mouse_scroll,
 						InputMapperMessage::PointerMove => &mut pointer_move,
+						InputMapperMessage::DoubleClick => &mut double_click,
 					};
 					arr.push(entry.clone());
 				}
 			)*
-			(key_up, key_down, pointer_move, mouse_scroll)
+			(key_up, key_down, pointer_move, mouse_scroll, double_click)
 		}};
 	}
 

editor/src/input/input_mapper_message.rs

@@ -16,6 +16,7 @@ pub enum InputMapperMessage {
 	KeyUp(Key),
 
 	// Messages
+	DoubleClick,
 	MouseScroll,
 	PointerMove,
 }

editor/src/input/input_preprocessor_message.rs

@@ -13,6 +13,7 @@ use serde::{Deserialize, Serialize};
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub enum InputPreprocessorMessage {
 	BoundsOfViewports { bounds_of_viewports: Vec<ViewportBounds> },
+	DoubleClick { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },
 	KeyDown { key: Key, modifier_keys: ModifierKeys },
 	KeyUp { key: Key, modifier_keys: ModifierKeys },
 	MouseDown { editor_mouse_state: EditorMouseState, modifier_keys: ModifierKeys },

editor/src/input/input_preprocessor_message_handler.rs

@@ -49,6 +49,14 @@ impl MessageHandler<InputPreprocessorMessage, ()> for InputPreprocessorMessageHa
 					);
 				}
 			}
+			InputPreprocessorMessage::DoubleClick { editor_mouse_state, modifier_keys } => {
+				self.handle_modifier_keys(modifier_keys, responses);
+
+				let mouse_state = editor_mouse_state.to_mouse_state(&self.viewport_bounds);
+				self.mouse.position = mouse_state.position;
+
+				responses.push_back(InputMapperMessage::DoubleClick.into());
+			}
 			InputPreprocessorMessage::KeyDown { key, modifier_keys } => {
 				self.handle_modifier_keys(modifier_keys, responses);
 				self.keyboard.set(key as usize);

editor/src/lib.rs

@@ -81,6 +81,7 @@ pub mod message_prelude {
 	pub use crate::viewport_tools::tools::rectangle::{RectangleMessage, RectangleMessageDiscriminant};
 	pub use crate::viewport_tools::tools::select::{SelectMessage, SelectMessageDiscriminant};
 	pub use crate::viewport_tools::tools::shape::{ShapeMessage, ShapeMessageDiscriminant};
+	pub use crate::viewport_tools::tools::text::{TextMessage, TextMessageDiscriminant};
 	pub use graphite_proc_macros::*;
 
 	pub use std::collections::VecDeque;