Merge branch 'master' into safari-click-and-drag-fix

Author: Keavon

editor/src/messages/layout/layout_message_handler.rs

@@ -123,7 +123,10 @@ impl LayoutMessageHandler {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (breadcrumb_trail_buttons.on_commit.callback)(&()),
 					WidgetValueAction::Update => {
-						let update_value = value.as_u64().expect("BreadcrumbTrailButtons update was not of type: u64");
+						let Some(update_value) = value.as_u64() else {
+							error!("BreadcrumbTrailButtons update was not of type: u64");
+							return;
+						};
 						(breadcrumb_trail_buttons.on_update.callback)(&update_value)
 					}
 				};
@@ -133,7 +136,10 @@ impl LayoutMessageHandler {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (checkbox_input.on_commit.callback)(&()),
 					WidgetValueAction::Update => {
-						let update_value = value.as_bool().expect("CheckboxInput update was not of type: bool");
+						let Some(update_value) = value.as_bool() else {
+							error!("CheckboxInput update was not of type: bool");
+							return;
+						};
 						checkbox_input.checked = update_value;
 						(checkbox_input.on_update.callback)(checkbox_input)
 					}
@@ -208,7 +214,10 @@ impl LayoutMessageHandler {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (curve_input.on_commit.callback)(&()),
 					WidgetValueAction::Update => {
-						let curve = serde_json::from_value(value).expect("CurveInput event data could not be deserialized");
+						let Some(curve) = serde_json::from_value(value).ok() else {
+							error!("CurveInput event data could not be deserialized");
+							return;
+						};
 						curve_input.value = curve;
 						(curve_input.on_update.callback)(curve_input)
 					}
@@ -219,13 +228,27 @@ impl LayoutMessageHandler {
 			Widget::DropdownInput(dropdown_input) => {
 				let callback_message = match action {
 					WidgetValueAction::Commit => {
-						let update_value = value.as_u64().unwrap_or_else(|| panic!("DropdownInput commit was not of type `u64`, found {value:?}"));
-						(dropdown_input.entries.iter().flatten().nth(update_value as usize).unwrap().on_commit.callback)(&())
+						let Some(update_value) = value.as_u64() else {
+							error!("DropdownInput commit was not of type `u64`, found {value:?}");
+							return;
+						};
+						let Some(entry) = dropdown_input.entries.iter().flatten().nth(update_value as usize) else {
+							error!("DropdownInput commit was not able to find entry for index {update_value}");
+							return;
+						};
+						(entry.on_commit.callback)(&())
 					}
 					WidgetValueAction::Update => {
-						let update_value = value.as_u64().unwrap_or_else(|| panic!("DropdownInput update was not of type `u64`, found {value:?}"));
+						let Some(update_value) = value.as_u64() else {
+							error!("DropdownInput update was not of type `u64`, found {value:?}");
+							return;
+						};
 						dropdown_input.selected_index = Some(update_value as u32);
-						(dropdown_input.entries.iter().flatten().nth(update_value as usize).unwrap().on_update.callback)(&())
+						let Some(entry) = dropdown_input.entries.iter().flatten().nth(update_value as usize) else {
+							error!("DropdownInput update was not able to find entry for index {update_value}");
+							return;
+						};
+						(entry.on_update.callback)(&())
 					}
 				};
 
@@ -235,12 +258,27 @@ impl LayoutMessageHandler {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (font_input.on_commit.callback)(&()),
 					WidgetValueAction::Update => {
-						let update_value = value.as_object().expect("FontInput update was not of type: object");
-						let font_family_value = update_value.get("fontFamily").expect("FontInput update does not have a fontFamily");
-						let font_style_value = update_value.get("fontStyle").expect("FontInput update does not have a fontStyle");
+						let Some(update_value) = value.as_object() else {
+							error!("FontInput update was not of type: object");
+							return;
+						};
+						let Some(font_family_value) = update_value.get("fontFamily") else {
+							error!("FontInput update does not have a fontFamily");
+							return;
+						};
+						let Some(font_style_value) = update_value.get("fontStyle") else {
+							error!("FontInput update does not have a fontStyle");
+							return;
+						};
 
-						let font_family = font_family_value.as_str().expect("FontInput update fontFamily was not of type: string");
-						let font_style = font_style_value.as_str().expect("FontInput update fontStyle was not of type: string");
+						let Some(font_family) = font_family_value.as_str() else {
+							error!("FontInput update fontFamily was not of type: string");
+							return;
+						};
+						let Some(font_style) = font_style_value.as_str() else {
+							error!("FontInput update fontStyle was not of type: string");
+							return;
+						};
 
 						font_input.font_family = font_family.into();
 						font_input.font_style = font_style.into();
@@ -285,7 +323,10 @@ impl LayoutMessageHandler {
 					responses.add(callback_message);
 				}
 				WidgetValueAction::Update => {
-					let value = value.as_str().expect("NodeCatalog update was not of type String").to_string();
+					let Some(value) = value.as_str().map(|s| s.to_string()) else {
+						error!("NodeCatalog update was not of type String");
+						return;
+					};
 					let callback_message = (node_type_input.on_update.callback)(&value);
 					responses.add(callback_message);
 				}
@@ -296,8 +337,11 @@ impl LayoutMessageHandler {
 					responses.add(callback_message);
 				}
 				WidgetValueAction::Update => match value {
-					Value::Number(num) => {
-						let update_value = num.as_f64().unwrap();
+					Value::Number(ref num) => {
+						let Some(update_value) = num.as_f64() else {
+							error!("NumberInput update was not of type: f64, found {value:?}");
+							return;
+						};
 						number_input.value = Some(update_value);
 						let callback_message = (number_input.on_update.callback)(number_input);
 						responses.add(callback_message);
@@ -323,7 +367,10 @@ impl LayoutMessageHandler {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (reference_point_input.on_commit.callback)(&()),
 					WidgetValueAction::Update => {
-						let update_value = value.as_str().expect("ReferencePointInput update was not of type: u64");
+						let Some(update_value) = value.as_str() else {
+							error!("ReferencePointInput update was not of type: u64");
+							return;
+						};
 						reference_point_input.value = update_value.into();
 						(reference_point_input.on_update.callback)(reference_point_input)
 					}
@@ -333,7 +380,10 @@ impl LayoutMessageHandler {
 			}
 			Widget::PopoverButton(_) => {}
 			Widget::RadioInput(radio_input) => {
-				let update_value = value.as_u64().expect("RadioInput update was not of type: u64");
+				let Some(update_value) = value.as_u64() else {
+					error!("RadioInput update was not of type: u64");
+					return;
+				};
 				radio_input.selected_index = Some(update_value as u32);
 				let callback_message = match action {
 					WidgetValueAction::Commit => (radio_input.entries[update_value as usize].on_commit.callback)(&()),
@@ -347,7 +397,10 @@ impl LayoutMessageHandler {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (text_area_input.on_commit.callback)(&()),
 					WidgetValueAction::Update => {
-						let update_value = value.as_str().expect("TextAreaInput update was not of type: string");
+						let Some(update_value) = value.as_str() else {
+							error!("TextAreaInput update was not of type: string");
+							return;
+						};
 						text_area_input.value = update_value.into();
 						(text_area_input.on_update.callback)(text_area_input)
 					}
@@ -367,7 +420,10 @@ impl LayoutMessageHandler {
 				let callback_message = match action {
 					WidgetValueAction::Commit => (text_input.on_commit.callback)(&()),
 					WidgetValueAction::Update => {
-						let update_value = value.as_str().expect("TextInput update was not of type: string");
+						let Some(update_value) = value.as_str() else {
+							error!("TextInput update was not of type: string");
+							return;
+						};
 						text_input.value = update_value.into();
 						(text_input.on_update.callback)(text_input)
 					}
@@ -411,10 +467,11 @@ impl LayoutMessageHandler {
 				self.layouts[layout_target as usize] = new_layout;
 
 				// Update the UI
-				responses.add(FrontendMessage::UpdateMenuBarLayout {
-					layout_target,
-					layout: self.layouts[layout_target as usize].clone().unwrap_menu_layout(action_input_mapping).layout,
-				});
+				let Some(layout) = self.layouts[layout_target as usize].clone().as_menu_layout(action_input_mapping).map(|x| x.layout) else {
+					error!("Called unwrap_menu_layout on a widget layout");
+					return;
+				};
+				responses.add(FrontendMessage::UpdateMenuBarLayout { layout_target, layout });
 			}
 		}
 	}

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -109,14 +109,14 @@ pub enum Layout {
 }
 
 impl Layout {
-	pub fn unwrap_menu_layout(self, action_input_mapping: &impl Fn(&MessageDiscriminant) -> Option<KeysGroup>) -> MenuLayout {
+	pub fn as_menu_layout(self, action_input_mapping: &impl Fn(&MessageDiscriminant) -> Option<KeysGroup>) -> Option<MenuLayout> {
 		if let Self::MenuLayout(mut menu) = self {
 			menu.layout
 				.iter_mut()
 				.for_each(|menu_column| menu_column.children.fill_in_shortcut_actions_with_keys(action_input_mapping));
-			menu
+			Some(menu)
 		} else {
-			panic!("Called unwrap_menu_layout on a widget layout");
+			None
 		}
 	}
 

editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs

@@ -1222,6 +1222,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 						NodeInput::value(TaggedValue::OptionalF64(TypesettingConfig::default().max_width), false),
 						NodeInput::value(TaggedValue::OptionalF64(TypesettingConfig::default().max_height), false),
 						NodeInput::value(TaggedValue::F64(TypesettingConfig::default().tilt), false),
+						NodeInput::value(TaggedValue::Bool(false), false),
 					],
 					..Default::default()
 				},
@@ -1281,14 +1282,15 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 						),
 						InputMetadata::with_name_description_override(
 							"Tilt",
-							"Faux italic",
+							"Faux italic.",
 							WidgetOverride::Number(NumberInputSettings {
 								min: Some(-85.),
 								max: Some(85.),
 								unit: Some("°".to_string()),
 								..Default::default()
 							}),
 						),
+						("Per-Glyph Instances", "Splits each text glyph into its own instance, i.e. row in the table of vector data.").into(),
 					],
 					output_names: vec!["Vector".to_string()],
 					..Default::default()

editor/src/messages/portfolio/document_migration.rs

@@ -635,7 +635,7 @@ fn migrate_node(node_id: &NodeId, node: &DocumentNode, network_path: &[NodeId],
 	}
 
 	// Upgrade Text node to include line height and character spacing, which were previously hardcoded to 1, from https://github.com/GraphiteEditor/Graphite/pull/2016
-	if reference == "Text" && inputs_count != 9 {
+	if reference == "Text" && inputs_count != 10 {
 		let mut template = resolve_document_node_type(reference)?.default_node_template();
 		document.network_interface.replace_implementation(node_id, network_path, &mut template);
 		let old_inputs = document.network_interface.replace_inputs(node_id, network_path, &mut template)?;
@@ -689,6 +689,15 @@ fn migrate_node(node_id: &NodeId, node: &DocumentNode, network_path: &[NodeId],
 			},
 			network_path,
 		);
+		document.network_interface.set_input(
+			&InputConnector::node(*node_id, 9),
+			if inputs_count >= 10 {
+				old_inputs[9].clone()
+			} else {
+				NodeInput::value(TaggedValue::Bool(false), false)
+			},
+			network_path,
+		);
 	}
 
 	// Upgrade Sine, Cosine, and Tangent nodes to include a boolean input for whether the output should be in radians, which was previously the only option but is now not the default
@@ -960,6 +969,22 @@ fn migrate_node(node_id: &NodeId, node: &DocumentNode, network_path: &[NodeId],
 		}
 	}
 
+	// Add the "Depth" parameter to the "Instance Index" node
+	if reference == "Instance Index" && inputs_count == 0 {
+		let mut node_template = resolve_document_node_type(reference)?.default_node_template();
+		document.network_interface.replace_implementation(node_id, network_path, &mut node_template);
+
+		let mut node_path = network_path.to_vec();
+		node_path.push(*node_id);
+
+		document.network_interface.add_import(TaggedValue::None, false, 0, "Primary", "", &node_path);
+		document.network_interface.add_import(TaggedValue::U32(0), false, 1, "Loop Level", "TODO", &node_path);
+	}
+
+	// ==================================
+	// PUT ALL MIGRATIONS ABOVE THIS LINE
+	// ==================================
+
 	// Ensure layers are positioned as stacks if they are upstream siblings of another layer
 	document.network_interface.load_structure();
 	let all_layers = LayerNodeIdentifier::ROOT_PARENT.descendants(document.network_interface.document_metadata()).collect::<Vec<_>>();

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

@@ -357,7 +357,7 @@ pub fn get_text_id(layer: LayerNodeIdentifier, network_interface: &NodeNetworkIn
 }
 
 /// Gets properties from the Text node
-pub fn get_text(layer: LayerNodeIdentifier, network_interface: &NodeNetworkInterface) -> Option<(&String, &Font, TypesettingConfig)> {
+pub fn get_text(layer: LayerNodeIdentifier, network_interface: &NodeNetworkInterface) -> Option<(&String, &Font, TypesettingConfig, bool)> {
 	let inputs = NodeGraphLayer::new(layer, network_interface).find_node_inputs("Text")?;
 
 	let Some(TaggedValue::String(text)) = &inputs[1].as_value() else { return None };
@@ -368,6 +368,9 @@ pub fn get_text(layer: LayerNodeIdentifier, network_interface: &NodeNetworkInter
 	let Some(&TaggedValue::OptionalF64(max_width)) = inputs[6].as_value() else { return None };
 	let Some(&TaggedValue::OptionalF64(max_height)) = inputs[7].as_value() else { return None };
 	let Some(&TaggedValue::F64(tilt)) = inputs[8].as_value() else { return None };
+	let Some(TaggedValue::Bool(per_glyph_instances)) = &inputs[9].as_value() else {
+		return None;
+	};
 
 	let typesetting = TypesettingConfig {
 		font_size,
@@ -377,7 +380,7 @@ pub fn get_text(layer: LayerNodeIdentifier, network_interface: &NodeNetworkInter
 		max_height,
 		tilt,
 	};
-	Some((text, font, typesetting))
+	Some((text, font, typesetting, *per_glyph_instances))
 }
 
 pub fn get_stroke_width(layer: LayerNodeIdentifier, network_interface: &NodeNetworkInterface) -> Option<f64> {

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

@@ -66,14 +66,22 @@ where
 
 /// 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 Some((text, font, typesetting)) = get_text(layer, &document.network_interface) else {
+	let Some((text, font, typesetting, per_glyph_instances)) = get_text(layer, &document.network_interface) else {
 		return Quad::from_box([DVec2::ZERO, DVec2::ZERO]);
 	};
 
 	let font_data = font_cache.get(font).map(|data| load_font(data));
 	let far = graphene_std::text::bounding_box(text, font_data, typesetting, false);
 
-	Quad::from_box([DVec2::ZERO, far])
+	// TODO: Once the instances refactor is complete and per_glyph_instances can be removed (since it'll be the default),
+	// TODO: remove this because the top of the dashed bounding overlay should no longer be based on the first line's baseline.
+	let vertical_offset = if per_glyph_instances {
+		DVec2::NEG_Y * typesetting.font_size * (1. + (typesetting.line_height_ratio - 1.) / 2.)
+	} else {
+		DVec2::ZERO
+	};
+
+	Quad::from_box([DVec2::ZERO + vertical_offset, far + vertical_offset])
 }
 
 pub fn calculate_segment_angle(anchor: PointId, segment: SegmentId, vector_data: &VectorData, prefer_handle_direction: bool) -> Option<f64> {

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

@@ -329,7 +329,7 @@ impl TextToolData {
 	fn load_layer_text_node(&mut self, document: &DocumentMessageHandler) -> Option<()> {
 		let transform = document.metadata().transform_to_viewport(self.layer);
 		let color = graph_modification_utils::get_fill_color(self.layer, &document.network_interface).unwrap_or(Color::BLACK);
-		let (text, font, typesetting) = graph_modification_utils::get_text(self.layer, &document.network_interface)?;
+		let (text, font, typesetting, _) = graph_modification_utils::get_text(self.layer, &document.network_interface)?;
 		self.editing_text = Some(EditingText {
 			text: text.clone(),
 			font: font.clone(),
@@ -524,7 +524,7 @@ impl Fsm for TextToolFsmState {
 						bounding_box_manager.render_quad(&mut overlay_context);
 						// Draw red overlay if text is clipped
 						let transformed_quad = layer_transform * bounds;
-						if let Some((text, font, typesetting)) = graph_modification_utils::get_text(layer.unwrap(), &document.network_interface) {
+						if let Some((text, font, typesetting, _)) = graph_modification_utils::get_text(layer.unwrap(), &document.network_interface) {
 							let font_data = font_cache.get(font).map(|data| load_font(data));
 							if lines_clipping(text.as_str(), font_data, typesetting) {
 								overlay_context.line(transformed_quad.0[2], transformed_quad.0[3], Some(COLOR_OVERLAY_RED), Some(3.));

editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs

@@ -1,4 +1,4 @@
-use crate::consts::{ANGLE_MEASURE_RADIUS_FACTOR, ARC_MEASURE_RADIUS_FACTOR_RANGE, COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GRAY_25, SLOWING_DIVISOR};
+use crate::consts::{ANGLE_MEASURE_RADIUS_FACTOR, ARC_MEASURE_RADIUS_FACTOR_RANGE, COLOR_OVERLAY_BLUE, COLOR_OVERLAY_GRAY, SLOWING_DIVISOR};
 use crate::messages::input_mapper::utility_types::input_mouse::{DocumentPosition, ViewportPosition};
 use crate::messages::portfolio::document::overlays::utility_types::{OverlayProvider, Pivot};
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
@@ -177,7 +177,7 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
 
 				if using_path_tool {
 					for (outline, transform) in &self.ghost_outline {
-						overlay_context.outline(outline.iter(), *transform, Some(COLOR_OVERLAY_GRAY_25));
+						overlay_context.outline(outline.iter(), *transform, Some(COLOR_OVERLAY_GRAY));
 					}
 				}
 
@@ -407,6 +407,10 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
 			TransformLayerMessage::BeginRotate => responses.add_front(TransformLayerMessage::BeginGRS { operation: TransformType::Rotate }),
 			TransformLayerMessage::BeginScale => responses.add_front(TransformLayerMessage::BeginGRS { operation: TransformType::Scale }),
 			TransformLayerMessage::CancelTransformOperation => {
+				if using_path_tool {
+					self.ghost_outline.clear();
+				}
+
 				if using_pen_tool {
 					self.typing.clear();
 
@@ -416,8 +420,6 @@ impl MessageHandler<TransformLayerMessage, TransformLayerMessageContext<'_>> for
 
 					responses.add(PenToolMessage::Abort);
 					responses.add(ToolMessage::UpdateHints);
-				} else if using_path_tool {
-					self.ghost_outline.clear();
 				} else {
 					selected.original_transforms.clear();
 					self.typing.clear();