Unwrap the Layout enum to replace it with the WidgetLayout struct now called Layout (#3448)

editor/src/dispatcher.rs

@@ -548,7 +548,7 @@ mod test {
 			for response in responses {
 				// Check for the existence of the file format incompatibility warning dialog after opening the test file
 				if let FrontendMessage::UpdateDialogColumn1 { diff } = response {
-					if let DiffUpdate::WidgetLayout(sub_layout) = &diff[0].new_value {
+					if let DiffUpdate::Layout(sub_layout) = &diff[0].new_value {
 						if let LayoutGroup::Row { widgets } = &sub_layout.0[0] {
 							if let Widget::TextLabel(TextLabel { value, .. }) = &widgets[0].widget {
 								print_problem_to_terminal_on_failure(value);

editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs

@@ -76,7 +76,7 @@ impl DialogLayoutHolder for ExportDialogMessageHandler {
 			TextButton::new("Cancel").on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
@@ -160,11 +160,11 @@ impl LayoutHolder for ExportDialogMessageHandler {
 				.widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![
+		Layout(vec![
 			LayoutGroup::Row { widgets: export_type },
 			LayoutGroup::Row { widgets: resolution },
 			LayoutGroup::Row { widgets: export_area },
 			LayoutGroup::Row { widgets: transparent_background },
-		]))
+		])
 	}
 }

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

@@ -66,7 +66,7 @@ impl DialogLayoutHolder for NewDocumentDialogMessageHandler {
 			TextButton::new("Cancel").on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
@@ -117,10 +117,6 @@ impl LayoutHolder for NewDocumentDialogMessageHandler {
 				.widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![
-			LayoutGroup::Row { widgets: name },
-			LayoutGroup::Row { widgets: infinite },
-			LayoutGroup::Row { widgets: scale },
-		]))
+		Layout(vec![LayoutGroup::Row { widgets: name }, LayoutGroup::Row { widgets: infinite }, LayoutGroup::Row { widgets: scale }])
 	}
 }

editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs

@@ -224,7 +224,7 @@ impl PreferencesDialogMessageHandler {
 				.widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![
+		Layout(vec![
 			LayoutGroup::Row { widgets: navigation_header },
 			LayoutGroup::Row { widgets: zoom_rate_label },
 			LayoutGroup::Row { widgets: zoom_rate },
@@ -237,7 +237,7 @@ impl PreferencesDialogMessageHandler {
 			LayoutGroup::Row { widgets: graph_wire_style },
 			LayoutGroup::Row { widgets: use_vello },
 			LayoutGroup::Row { widgets: vector_meshes },
-		]))
+		])
 	}
 
 	pub fn send_layout(&self, responses: &mut VecDeque<Message>, layout_target: LayoutTarget, preferences: &PreferencesMessageHandler) {
@@ -272,7 +272,7 @@ impl PreferencesDialogMessageHandler {
 			TextButton::new("Reset to Defaults").on_update(|_| PreferencesMessage::ResetToDefaults.into()).widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 
 	fn send_layout_buttons(&self, responses: &mut VecDeque<Message>, layout_target: LayoutTarget) {

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

@@ -15,7 +15,7 @@ impl DialogLayoutHolder for AboutGraphiteDialog {
 	fn layout_buttons(&self) -> Layout {
 		let widgets = vec![TextButton::new("OK").emphasized(true).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance()];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 
 	fn layout_column_2(&self) -> Layout {
@@ -51,13 +51,13 @@ impl DialogLayoutHolder for AboutGraphiteDialog {
 				.widget_instance(),
 		);
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Column { widgets }]))
+		Layout(vec![LayoutGroup::Column { widgets }])
 	}
 }
 
 impl LayoutHolder for AboutGraphiteDialog {
 	fn layout(&self) -> Layout {
-		Layout::WidgetLayout(WidgetLayout(vec![
+		Layout(vec![
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new("About this release").bold(true).widget_instance()],
 			},
@@ -67,6 +67,6 @@ impl LayoutHolder for AboutGraphiteDialog {
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new(format!("Copyright © {} Graphite contributors", self.localized_commit_year)).widget_instance()],
 			},
-		]))
+		])
 	}
 }

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

@@ -24,7 +24,7 @@ impl DialogLayoutHolder for CloseAllDocumentsDialog {
 			TextButton::new("Cancel").on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
@@ -32,13 +32,13 @@ impl LayoutHolder for CloseAllDocumentsDialog {
 	fn layout(&self) -> Layout {
 		let unsaved_list = "• ".to_string() + &self.unsaved_document_names.join("\n• ");
 
-		Layout::WidgetLayout(WidgetLayout(vec![
+		Layout(vec![
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new("Save documents before closing them?").bold(true).multiline(true).widget_instance()],
 			},
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new(format!("Documents with unsaved changes:\n{unsaved_list}")).multiline(true).widget_instance()],
 			},
-		]))
+		])
 	}
 }

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

@@ -35,7 +35,7 @@ impl DialogLayoutHolder for CloseDocumentDialog {
 			TextButton::new("Cancel").on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
@@ -51,13 +51,13 @@ impl LayoutHolder for CloseDocumentDialog {
 
 		let break_lines = if self.document_name.len() > max_one_line_length { '\n' } else { ' ' };
 
-		Layout::WidgetLayout(WidgetLayout(vec![
+		Layout(vec![
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new("Save document before closing it?").bold(true).widget_instance()],
 			},
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new(format!("\"{name}{ellipsis}\"{break_lines}has unsaved changes")).multiline(true).widget_instance()],
 			},
-		]))
+		])
 	}
 }

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

@@ -13,7 +13,7 @@ impl DialogLayoutHolder for ComingSoonDialog {
 	fn layout_buttons(&self) -> Layout {
 		let widgets = vec![TextButton::new("OK").emphasized(true).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance()];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
@@ -43,6 +43,6 @@ impl LayoutHolder for ComingSoonDialog {
 			rows.push(LayoutGroup::Row { widgets: row3 });
 		}
 
-		Layout::WidgetLayout(WidgetLayout(rows))
+		Layout(rows)
 	}
 }

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

@@ -22,7 +22,7 @@ impl DialogLayoutHolder for DemoArtworkDialog {
 	fn layout_buttons(&self) -> Layout {
 		let widgets = vec![TextButton::new("Close").emphasized(true).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance()];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
@@ -59,6 +59,6 @@ impl LayoutHolder for DemoArtworkDialog {
 			.collect();
 		let _ = rows_of_images_with_buttons.pop();
 
-		Layout::WidgetLayout(WidgetLayout(rows_of_images_with_buttons))
+		Layout(rows_of_images_with_buttons)
 	}
 }

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

@@ -14,19 +14,19 @@ impl DialogLayoutHolder for ErrorDialog {
 	fn layout_buttons(&self) -> Layout {
 		let widgets = vec![TextButton::new("OK").emphasized(true).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance()];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
 impl LayoutHolder for ErrorDialog {
 	fn layout(&self) -> Layout {
-		Layout::WidgetLayout(WidgetLayout(vec![
+		Layout(vec![
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new(&self.title).bold(true).widget_instance()],
 			},
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new(&self.description).multiline(true).widget_instance()],
 			},
-		]))
+		])
 	}
 }

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

@@ -12,7 +12,7 @@ impl DialogLayoutHolder for LicensesDialog {
 	fn layout_buttons(&self) -> Layout {
 		let widgets = vec![TextButton::new("OK").emphasized(true).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance()];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 
 	fn layout_column_2(&self) -> Layout {
@@ -43,7 +43,7 @@ impl DialogLayoutHolder for LicensesDialog {
 			.map(|&(icon, label, message_factory)| TextButton::new(label).icon(Some((icon).into())).flush(true).on_update(move |_| message_factory()).widget_instance())
 			.collect();
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Column { widgets }]))
+		Layout(vec![LayoutGroup::Column { widgets }])
 	}
 }
 
@@ -63,13 +63,13 @@ impl LayoutHolder for LicensesDialog {
 		);
 		let description = description.trim();
 
-		Layout::WidgetLayout(WidgetLayout(vec![
+		Layout(vec![
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new("Graphite is free, open source software").bold(true).widget_instance()],
 			},
 			LayoutGroup::Row {
 				widgets: vec![TextLabel::new(description).multiline(true).widget_instance()],
 			},
-		]))
+		])
 	}
 }

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

@@ -12,7 +12,7 @@ impl DialogLayoutHolder for LicensesThirdPartyDialog {
 	fn layout_buttons(&self) -> Layout {
 		let widgets = vec![TextButton::new("OK").emphasized(true).on_update(|_| FrontendMessage::DisplayDialogDismiss.into()).widget_instance()];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 
@@ -31,7 +31,7 @@ impl LayoutHolder for LicensesThirdPartyDialog {
 		// Two characters (one before, one after) the sequence of underscore characters, plus one additional column to provide a space between the text and the scrollbar
 		let non_wrapping_column_width = license_text.split('\n').map(|line| line.chars().filter(|&c| c == '_').count()).max().unwrap_or(0) + 2 + 1;
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row {
+		Layout(vec![LayoutGroup::Row {
 			widgets: vec![
 				TextLabel::new(license_text)
 					.monospace(true)
@@ -39,6 +39,6 @@ impl LayoutHolder for LicensesThirdPartyDialog {
 					.min_width(format!("{non_wrapping_column_width}ch"))
 					.widget_instance(),
 			],
-		}]))
+		}])
 	}
 }

editor/src/messages/layout/layout_message_handler.rs

@@ -24,12 +24,10 @@ impl MessageHandler<LayoutMessage, LayoutMessageContext<'_>> for LayoutMessageHa
 		match message {
 			LayoutMessage::ResendActiveWidget { layout_target, widget_id } => {
 				// Find the updated diff based on the specified layout target
-				let Some(diff) = (match &self.layouts[layout_target as usize] {
-					Layout::WidgetLayout(layout) => Self::get_widget_path(layout, widget_id).map(|(widget, widget_path)| {
-						// Create a widget update diff for the relevant id
-						let new_value = DiffUpdate::Widget(widget.clone());
-						WidgetDiff { widget_path, new_value }
-					}),
+				let Some(diff) = Self::get_widget_path(&self.layouts[layout_target as usize], widget_id).map(|(widget, widget_path)| {
+					// Create a widget update diff for the relevant id
+					let new_value = DiffUpdate::Widget(widget.clone());
+					WidgetDiff { widget_path, new_value }
 				}) else {
 					return;
 				};
@@ -41,7 +39,7 @@ impl MessageHandler<LayoutMessage, LayoutMessageContext<'_>> for LayoutMessageHa
 			}
 			LayoutMessage::DestroyLayout { layout_target } => {
 				if let Some(layout) = self.layouts.get_mut(layout_target as usize) {
-					*layout = Default::default();
+					*layout = Layout::default();
 				}
 			}
 			LayoutMessage::WidgetValueCommit { layout_target, widget_id, value } => {
@@ -61,7 +59,7 @@ impl MessageHandler<LayoutMessage, LayoutMessageContext<'_>> for LayoutMessageHa
 
 impl LayoutMessageHandler {
 	/// Get the widget path for the widget with the specified id
-	fn get_widget_path(widget_layout: &WidgetLayout, widget_id: WidgetId) -> Option<(&WidgetInstance, Vec<usize>)> {
+	fn get_widget_path(widget_layout: &Layout, widget_id: WidgetId) -> Option<(&WidgetInstance, Vec<usize>)> {
 		let mut stack = widget_layout.0.iter().enumerate().map(|(index, val)| (vec![index], val)).collect::<Vec<_>>();
 		while let Some((mut widget_path, layout_group)) = stack.pop() {
 			match layout_group {
@@ -124,10 +122,7 @@ impl LayoutMessageHandler {
 			return;
 		};
 
-		let mut layout_iter = match layout {
-			Layout::WidgetLayout(widget_layout) => widget_layout.iter_mut(),
-		};
-		let Some(widget_instance) = layout_iter.find(|widget| widget.widget_id == widget_id) else {
+		let Some(widget_instance) = layout.iter_mut().find(|widget| widget.widget_id == widget_id) else {
 			warn!("handle_widget_callback was called referencing an invalid widget ID, although the layout target was valid. `widget_id: {widget_id}`, `layout_target: {layout_target:?}`",);
 			return;
 		};
@@ -479,31 +474,25 @@ impl LayoutMessageHandler {
 		responses: &mut VecDeque<Message>,
 		action_input_mapping: &impl Fn(&MessageDiscriminant) -> Option<KeysGroup>,
 	) {
-		match new_layout {
-			Layout::WidgetLayout(_) => {
-				let mut widget_diffs = Vec::new();
+		let mut widget_diffs = Vec::new();
 
-				let Layout::WidgetLayout(current) = &mut self.layouts[layout_target as usize];
-				let Layout::WidgetLayout(new) = new_layout;
-				current.diff(new, &mut Vec::new(), &mut widget_diffs);
+		self.layouts[layout_target as usize].diff(new_layout, &mut Vec::new(), &mut widget_diffs);
 
-				// Skip sending if no diff
-				if widget_diffs.is_empty() {
-					return;
-				}
-
-				// On Mac we need the full MenuBar layout to construct the native menu
-				#[cfg(target_os = "macos")]
-				if layout_target == LayoutTarget::MenuBar {
-					widget_diffs = vec![WidgetDiff {
-						widget_path: Vec::new(),
-						new_value: DiffUpdate::WidgetLayout(current.layout.clone()),
-					}];
-				}
-
-				self.send_diff(widget_diffs, layout_target, responses, action_input_mapping);
-			}
+		// Skip sending if no diff
+		if widget_diffs.is_empty() {
+			return;
 		}
+
+		// On Mac we need the full MenuBar layout to construct the native menu
+		#[cfg(target_os = "macos")]
+		if layout_target == LayoutTarget::MenuBar {
+			widget_diffs = vec![WidgetDiff {
+				widget_path: Vec::new(),
+				new_value: DiffUpdate::Layout(current.layout.clone()),
+			}];
+		}
+
+		self.send_diff(widget_diffs, layout_target, responses, action_input_mapping);
 	}
 
 	/// Send a diff to the frontend based on the layout target.

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

@@ -103,24 +103,11 @@ pub trait DialogLayoutHolder: LayoutHolder {
 	}
 }
 
-// TODO: Unwrap this enum
-/// Wraps a choice of layout type. The chosen layout contains an arrangement of widgets mounted somewhere specific in the frontend.
-#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, specta::Type)]
-pub enum Layout {
-	WidgetLayout(WidgetLayout),
-}
-
-impl Default for Layout {
-	fn default() -> Self {
-		Self::WidgetLayout(WidgetLayout::default())
-	}
-}
-
-// TODO: Unwrap this struct
+/// Contains an arrangement of widgets mounted somewhere specific in the frontend.
 #[derive(Debug, Default, Clone, serde::Serialize, serde::Deserialize, PartialEq, specta::Type)]
-pub struct WidgetLayout(pub Vec<LayoutGroup>);
+pub struct Layout(pub Vec<LayoutGroup>);
 
-impl WidgetLayout {
+impl Layout {
 	pub fn iter(&self) -> WidgetIter<'_> {
 		WidgetIter {
 			stack: self.0.iter().collect(),
@@ -144,7 +131,7 @@ impl WidgetLayout {
 			self.0.clone_from(&new.0);
 
 			// Push an update sublayout to the diff
-			let new = DiffUpdate::WidgetLayout(new);
+			let new = DiffUpdate::Layout(new);
 			widget_diffs.push(WidgetDiff {
 				widget_path: widget_path.to_vec(),
 				new_value: new,
@@ -285,7 +272,7 @@ pub enum LayoutGroup {
 		visible: bool,
 		pinned: bool,
 		id: u64,
-		layout: WidgetLayout,
+		layout: Layout,
 	},
 }
 
@@ -588,12 +575,10 @@ pub struct WidgetDiff {
 }
 
 /// The new value of the UI, sent as part of a diff.
-///
-/// An update can represent a single widget or an entire WidgetLayout, or just a single layout group.
 #[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize, specta::Type)]
 pub enum DiffUpdate {
-	#[serde(rename = "widgetLayout")]
-	WidgetLayout(WidgetLayout),
+	#[serde(rename = "layout")]
+	Layout(Layout),
 	#[serde(rename = "layoutGroup")]
 	LayoutGroup(LayoutGroup),
 	#[serde(rename = "widget")]
@@ -675,7 +660,7 @@ impl DiffUpdate {
 		};
 
 		match self {
-			Self::WidgetLayout(widget_layout) => widget_layout.0.iter_mut().flat_map(|layout_group| layout_group.iter_mut()).for_each(|widget_instance| {
+			Self::Layout(layout) => layout.0.iter_mut().flat_map(|layout_group| layout_group.iter_mut()).for_each(|widget_instance| {
 				convert_tooltip(widget_instance);
 				convert_menu_lists(widget_instance);
 			}),

editor/src/messages/layout/utility_types/widgets/button_widgets.rs

@@ -63,7 +63,7 @@ pub struct PopoverButton {
 	pub tooltip_shortcut: Option<ActionShortcut>,
 
 	#[serde(rename = "popoverLayout")]
-	pub popover_layout: WidgetLayout,
+	pub popover_layout: Layout,
 
 	#[serde(rename = "popoverMinWidth")]
 	pub popover_min_width: Option<u32>,

editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs

@@ -1,5 +1,5 @@
 use super::VectorTableTab;
-use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, LayoutTarget, WidgetLayout};
+use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, LayoutTarget};
 use crate::messages::portfolio::document::data_panel::DataPanelMessage;
 use crate::messages::portfolio::document::utility_types::network_interface::NodeNetworkInterface;
 use crate::messages::prelude::*;
@@ -83,11 +83,12 @@ impl DataPanelMessageHandler {
 		};
 
 		// Main data visualization
-		let mut layout = self
-			.introspected_data
-			.as_ref()
-			.map(|instrospected_data| generate_layout(instrospected_data, &mut layout_data).unwrap_or_else(|| label("Visualization of this data type is not yet supported")))
-			.unwrap_or_default();
+		let mut layout = Layout(
+			self.introspected_data
+				.as_ref()
+				.map(|instrospected_data| generate_layout(instrospected_data, &mut layout_data).unwrap_or_else(|| label("Visualization of this data type is not yet supported")))
+				.unwrap_or_default(),
+		);
 
 		let mut widgets = Vec::new();
 
@@ -127,11 +128,11 @@ impl DataPanelMessageHandler {
 		}
 
 		if !widgets.is_empty() {
-			layout.insert(0, LayoutGroup::Row { widgets });
+			layout.0.insert(0, LayoutGroup::Row { widgets });
 		}
 
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(WidgetLayout(layout)),
+			layout,
 			layout_target: LayoutTarget::DataPanel,
 		});
 	}

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -323,17 +323,17 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
 
 				// Clear the control bar
 				responses.add(LayoutMessage::SendLayout {
-					layout: Layout::WidgetLayout(Default::default()),
+					layout: Layout::default(),
 					layout_target: LayoutTarget::LayersPanelControlLeftBar,
 				});
 				responses.add(LayoutMessage::SendLayout {
-					layout: Layout::WidgetLayout(Default::default()),
+					layout: Layout::default(),
 					layout_target: LayoutTarget::LayersPanelControlRightBar,
 				});
 
 				// Clear the bottom bar
 				responses.add(LayoutMessage::SendLayout {
-					layout: Layout::WidgetLayout(Default::default()),
+					layout: Layout::default(),
 					layout_target: LayoutTarget::LayersPanelBottomBar,
 				});
 			}
@@ -2175,7 +2175,7 @@ impl DocumentMessageHandler {
 	pub fn update_document_widgets(&self, responses: &mut VecDeque<Message>, animation_is_playing: bool, time: Duration) {
 		// Document mode (dropdown menu at the left of the bar above the viewport, before the tool options)
 
-		let document_mode_layout = WidgetLayout(vec![LayoutGroup::Row {
+		let layout = Layout(vec![LayoutGroup::Row {
 			widgets: vec![
 				// DropdownInput::new(
 				// 	vec![vec![
@@ -2200,7 +2200,7 @@ impl DocumentMessageHandler {
 		}]);
 
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(document_mode_layout),
+			layout,
 			layout_target: LayoutTarget::DocumentMode,
 		});
 
@@ -2235,7 +2235,7 @@ impl DocumentMessageHandler {
 				})
 				.widget_instance(),
 			PopoverButton::new()
-				.popover_layout(WidgetLayout(vec![
+				.popover_layout(Layout(vec![
 					LayoutGroup::Row {
 						widgets: vec![TextLabel::new("Overlays").bold(true).widget_instance()],
 					},
@@ -2484,7 +2484,7 @@ impl DocumentMessageHandler {
 				})
 				.widget_instance(),
 			PopoverButton::new()
-				.popover_layout(WidgetLayout(
+				.popover_layout(Layout(
 					[
 						LayoutGroup::Row {
 							widgets: vec![TextLabel::new("Snapping").bold(true).widget_instance()],
@@ -2548,7 +2548,7 @@ impl DocumentMessageHandler {
 				.on_update(|optional_input: &CheckboxInput| DocumentMessage::GridVisibility { visible: optional_input.checked }.into())
 				.widget_instance(),
 			PopoverButton::new()
-				.popover_layout(WidgetLayout(overlay_options(&self.snapping_state.grid)))
+				.popover_layout(Layout(overlay_options(&self.snapping_state.grid)))
 				.popover_min_width(Some(320))
 				.widget_instance(),
 			Separator::new(SeparatorType::Unrelated).widget_instance(),
@@ -2574,7 +2574,7 @@ impl DocumentMessageHandler {
 			.narrow(true)
 			.widget_instance(),
 			// PopoverButton::new().popover_layout(
-			// 	WidgetLayout(vec![
+			// 	Layout(vec![
 			// 		LayoutGroup::Row {
 			// 			widgets: vec![TextLabel::new("Render Mode").bold(true).widget_instance()],
 			// 		},
@@ -2632,10 +2632,8 @@ impl DocumentMessageHandler {
 				.widget_instance(),
 		]);
 
-		let document_bar_layout = WidgetLayout(vec![LayoutGroup::Row { widgets }]);
-
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(document_bar_layout),
+			layout: Layout(vec![LayoutGroup::Row { widgets }]),
 			layout_target: LayoutTarget::DocumentBar,
 		});
 		responses.add(NodeGraphMessage::RunDocumentGraph);
@@ -2773,7 +2771,7 @@ impl DocumentMessageHandler {
 				.tooltip_label("Fill")
 				.widget_instance(),
 		];
-		let layers_panel_control_bar_left = WidgetLayout(vec![LayoutGroup::Row { widgets }]);
+		let layers_panel_control_bar_left = Layout(vec![LayoutGroup::Row { widgets }]);
 
 		let widgets = vec![
 			IconButton::new(if selection_all_locked { "PadlockLocked" } else { "PadlockUnlocked" }, 24)
@@ -2791,14 +2789,14 @@ impl DocumentMessageHandler {
 				.disabled(!has_selection)
 				.widget_instance(),
 		];
-		let layers_panel_control_bar_right = WidgetLayout(vec![LayoutGroup::Row { widgets }]);
+		let layers_panel_control_bar_right = Layout(vec![LayoutGroup::Row { widgets }]);
 
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(layers_panel_control_bar_left),
+			layout: layers_panel_control_bar_left,
 			layout_target: LayoutTarget::LayersPanelControlLeftBar,
 		});
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(layers_panel_control_bar_right),
+			layout: layers_panel_control_bar_right,
 			layout_target: LayoutTarget::LayersPanelControlRightBar,
 		});
 	}
@@ -2845,7 +2843,7 @@ impl DocumentMessageHandler {
 							}
 						})
 						.widget_instance();
-					WidgetLayout(vec![LayoutGroup::Row { widgets: vec![node_chooser] }])
+					Layout(vec![LayoutGroup::Row { widgets: vec![node_chooser] }])
 				})
 				.widget_instance(),
 			Separator::new(SeparatorType::Unrelated).widget_instance(),
@@ -2870,10 +2868,8 @@ impl DocumentMessageHandler {
 				.disabled(!has_selection)
 				.widget_instance(),
 		];
-		let layers_panel_bottom_bar = WidgetLayout(vec![LayoutGroup::Row { widgets }]);
-
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(layers_panel_bottom_bar),
+			layout: Layout(vec![LayoutGroup::Row { widgets }]),
 			layout_target: LayoutTarget::LayersPanelBottomBar,
 		});
 	}

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

@@ -2069,7 +2069,7 @@ impl NodeGraphMessageHandler {
 	/// Send the cached layout to the frontend for the control bar at the top of the node panel
 	fn send_node_bar_layout(&self, responses: &mut VecDeque<Message>) {
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(WidgetLayout(self.widgets.to_vec())),
+			layout: Layout(self.widgets.to_vec()),
 			layout_target: LayoutTarget::NodeGraphControlBar,
 		});
 	}
@@ -2145,7 +2145,7 @@ impl NodeGraphMessageHandler {
 							}
 						})
 						.widget_instance();
-					WidgetLayout(vec![LayoutGroup::Row { widgets: vec![node_chooser] }])
+					Layout(vec![LayoutGroup::Row { widgets: vec![node_chooser] }])
 				})
 				.widget_instance(),
 			//
@@ -2443,7 +2443,7 @@ impl NodeGraphMessageHandler {
 										.into()
 									})
 									.widget_instance();
-								WidgetLayout(vec![LayoutGroup::Row { widgets: vec![node_chooser] }])
+								Layout(vec![LayoutGroup::Row { widgets: vec![node_chooser] }])
 							})
 							.widget_instance(),
 						Separator::new(SeparatorType::Related).widget_instance(),

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

@@ -1699,7 +1699,7 @@ pub(crate) fn generate_node_properties(node_id: NodeId, context: &mut NodeProper
 		visible,
 		pinned,
 		id: node_id.0,
-		layout: WidgetLayout(layout),
+		layout: Layout(layout),
 	}
 }
 

editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs

@@ -35,7 +35,7 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 		match message {
 			PropertiesPanelMessage::Clear => {
 				responses.add(LayoutMessage::SendLayout {
-					layout: Layout::WidgetLayout(WidgetLayout(vec![])),
+					layout: Layout::default(),
 					layout_target: LayoutTarget::PropertiesPanel,
 				});
 			}
@@ -53,10 +53,10 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 					document_name,
 					executor,
 				};
-				let properties_sections = NodeGraphMessageHandler::collate_properties(&mut node_properties_context);
+				let layout = Layout(NodeGraphMessageHandler::collate_properties(&mut node_properties_context));
 
 				node_properties_context.responses.add(LayoutMessage::SendLayout {
-					layout: Layout::WidgetLayout(WidgetLayout(properties_sections)),
+					layout,
 					layout_target: LayoutTarget::PropertiesPanel,
 				});
 			}

editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs

@@ -736,6 +736,6 @@ impl LayoutHolder for MenuBarMessageHandler {
 				.widget_instance(),
 		];
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets: menu_bar_buttons }]))
+		Layout(vec![LayoutGroup::Row { widgets: menu_bar_buttons }])
 	}
 }

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -924,7 +924,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 					layout_target: LayoutTarget::WelcomeScreenButtons,
 				});
 				responses.add(LayoutMessage::SendLayout {
-					layout: Layout::WidgetLayout(WidgetLayout(vec![table])),
+					layout: Layout(vec![table]),
 					layout_target: LayoutTarget::WelcomeScreenButtons,
 				});
 			}

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

@@ -75,7 +75,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Artb
 
 impl LayoutHolder for ArtboardTool {
 	fn layout(&self) -> Layout {
-		Layout::WidgetLayout(WidgetLayout::default())
+		Layout::default()
 	}
 }
 

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

@@ -220,7 +220,7 @@ impl LayoutHolder for BrushTool {
 				.widget_instance(),
 		);
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 

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

@@ -35,7 +35,7 @@ impl ToolMetadata for EyedropperTool {
 
 impl LayoutHolder for EyedropperTool {
 	fn layout(&self) -> Layout {
-		Layout::WidgetLayout(WidgetLayout::default())
+		Layout::default()
 	}
 }
 

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

@@ -37,7 +37,7 @@ impl ToolMetadata for FillTool {
 
 impl LayoutHolder for FillTool {
 	fn layout(&self) -> Layout {
-		Layout::WidgetLayout(WidgetLayout::default())
+		Layout::default()
 	}
 }
 

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

@@ -151,7 +151,7 @@ impl LayoutHolder for FreehandTool {
 		widgets.push(Separator::new(SeparatorType::Unrelated).widget_instance());
 		widgets.push(create_weight_widget(self.options.line_weight));
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 

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

@@ -107,7 +107,7 @@ impl LayoutHolder for GradientTool {
 		.selected_index(Some((self.selected_gradient().unwrap_or(self.options.gradient_type) == GradientType::Radial) as u32))
 		.widget_instance();
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets: vec![gradient_type] }]))
+		Layout(vec![LayoutGroup::Row { widgets: vec![gradient_type] }])
 	}
 }
 

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

@@ -34,7 +34,7 @@ impl ToolMetadata for NavigateTool {
 
 impl LayoutHolder for NavigateTool {
 	fn layout(&self) -> Layout {
-		Layout::WidgetLayout(WidgetLayout::default())
+		Layout::default()
 	}
 }
 

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

@@ -342,7 +342,7 @@ impl LayoutHolder for PathTool {
 
 		let _pin_pivot = pin_pivot_widget(self.tool_data.pivot_gizmo.pin_active(), false, PivotToolSource::Path);
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row {
+		Layout(vec![LayoutGroup::Row {
 			widgets: vec![
 				x_location,
 				related_seperator.clone(),
@@ -367,7 +367,7 @@ impl LayoutHolder for PathTool {
 				// related_seperator.clone(),
 				// pin_pivot,
 			],
-		}]))
+		}])
 	}
 }
 

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

@@ -238,7 +238,7 @@ impl LayoutHolder for PenTool {
 			.widget_instance(),
 		);
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 

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

@@ -252,7 +252,7 @@ impl LayoutHolder for SelectTool {
 		widgets.extend(self.alignment_widgets(disabled));
 		// widgets.push(
 		// 	PopoverButton::new()
-		// 		.popover_layout(WidgetLayout(vec![
+		// 		.popover_layout(Layout(vec![
 		// 			LayoutGroup::Row {
 		// 				widgets: vec![TextLabel::new("Align").bold(true).widget_instance()],
 		// 			},
@@ -277,7 +277,7 @@ impl LayoutHolder for SelectTool {
 		widgets.push(Separator::new(SeparatorType::Unrelated).widget_instance());
 		widgets.extend(self.boolean_widgets(self.tool_data.selected_layers_count));
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 

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

@@ -335,7 +335,7 @@ impl LayoutHolder for ShapeTool {
 		widgets.push(Separator::new(SeparatorType::Unrelated).widget_instance());
 		widgets.push(create_weight_widget(self.options.line_weight));
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 

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

@@ -158,7 +158,7 @@ impl LayoutHolder for SplineTool {
 		widgets.push(Separator::new(SeparatorType::Unrelated).widget_instance());
 		widgets.push(create_weight_widget(self.options.line_weight));
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 

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

@@ -203,7 +203,7 @@ impl LayoutHolder for TextTool {
 			},
 		));
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 }
 

editor/src/messages/tool/utility_types.rs

@@ -117,7 +117,7 @@ pub struct DocumentToolData {
 
 impl DocumentToolData {
 	pub fn update_working_colors(&self, responses: &mut VecDeque<Message>) {
-		let layout = WidgetLayout(vec![
+		let layout = Layout(vec![
 			LayoutGroup::Row {
 				widgets: vec![WorkingColorsInput::new(self.primary_color.to_gamma_srgb(), self.secondary_color.to_gamma_srgb()).widget_instance()],
 			},
@@ -138,7 +138,7 @@ impl DocumentToolData {
 		]);
 
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(layout),
+			layout,
 			layout_target: LayoutTarget::WorkingColors,
 		});
 
@@ -290,7 +290,7 @@ impl LayoutHolder for ToolData {
 			.skip(1)
 			.collect();
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets: tool_groups_layout }]))
+		Layout(vec![LayoutGroup::Row { widgets: tool_groups_layout }])
 	}
 }
 
@@ -545,7 +545,7 @@ impl HintData {
 			}
 		}
 
-		Layout::WidgetLayout(WidgetLayout(vec![LayoutGroup::Row { widgets }]))
+		Layout(vec![LayoutGroup::Row { widgets }])
 	}
 
 	pub fn send_layout(&self, responses: &mut VecDeque<Message>) {
@@ -557,7 +557,7 @@ impl HintData {
 
 	pub fn clear_layout(responses: &mut VecDeque<Message>) {
 		responses.add(LayoutMessage::SendLayout {
-			layout: Layout::WidgetLayout(WidgetLayout(vec![])),
+			layout: Layout::default(),
 			layout_target: LayoutTarget::StatusBarHints,
 		});
 	}