Fix artboard tool and remove old artboard code

editor/src/messages/dialog/dialog_message_handler.rs

@@ -1,6 +1,7 @@
 use super::simple_dialogs::{self, AboutGraphiteDialog, ComingSoonDialog, DemoArtworkDialog, LicensesDialog};
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
+use crate::messages::tool::common_functionality::graph_modification_utils::is_artboard;
 
 /// Stores the dialogs which require state. These are the ones that have their own message handlers, and are not the ones defined in `simple_dialogs`.
 #[derive(Debug, Default, Clone)]
@@ -67,23 +68,19 @@ impl MessageHandler<DialogMessage, (&PortfolioMessageHandler, &PreferencesMessag
 			}
 			DialogMessage::RequestExportDialog => {
 				if let Some(document) = portfolio.active_document() {
-					let artboard_handler = &document.artboard_message_handler;
 					let mut index = 0;
-					let artboards = artboard_handler
-						.artboard_ids
-						.iter()
-						.rev()
-						.filter_map(|&artboard| artboard_handler.artboards_document.layer(&[artboard]).ok().map(|layer| (artboard, layer)))
-						.map(|(artboard, layer)| {
+					let artboards = document
+						.document_legacy
+						.metadata
+						.all_layers()
+						.filter(|&layer| is_artboard(layer, &document.document_legacy))
+						.map(|layer| {
 							(
-								artboard,
-								format!(
-									"Artboard: {}",
-									layer.name.clone().unwrap_or_else(|| {
-										index += 1;
-										format!("Untitled {index}")
-									})
-								),
+								layer,
+								format!("Artboard: {}", {
+									index += 1;
+									format!("Untitled {index}")
+								}),
 							)
 						})
 						.collect();

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

@@ -2,7 +2,7 @@ use crate::messages::frontend::utility_types::{ExportBounds, FileType};
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::prelude::*;
 
-use document_legacy::LayerId;
+use document_legacy::document_metadata::LayerNodeIdentifier;
 
 /// A dialog to allow users to customize their file export.
 #[derive(Debug, Clone, Default)]
@@ -11,7 +11,7 @@ pub struct ExportDialogMessageHandler {
 	pub scale_factor: f64,
 	pub bounds: ExportBounds,
 	pub transparent_background: bool,
-	pub artboards: HashMap<LayerId, String>,
+	pub artboards: HashMap<LayerNodeIdentifier, String>,
 	pub has_selection: bool,
 }
 
@@ -86,7 +86,20 @@ impl LayoutHolder for ExportDialogMessageHandler {
 				.widget_holder(),
 		];
 
-		let artboards = self.artboards.iter().map(|(&val, name)| (ExportBounds::Artboard(val), name.to_string(), false));
+		let resolution = vec![
+			TextLabel::new("Scale Factor").table_align(true).min_width(100).widget_holder(),
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			NumberInput::new(Some(self.scale_factor))
+				.unit("")
+				.min(0.)
+				.max((1u64 << std::f64::MANTISSA_DIGITS) as f64)
+				.disabled(self.file_type == FileType::Svg)
+				.on_update(|number_input: &NumberInput| ExportDialogMessage::ScaleFactor(number_input.value.unwrap()).into())
+				.min_width(200)
+				.widget_holder(),
+		];
+
+		let artboards = self.artboards.iter().map(|(&layer, name)| (ExportBounds::Artboard(layer), name.to_string(), false));
 		let mut export_area_options = vec![
 			(ExportBounds::AllArtwork, "All Artwork".to_string(), false),
 			(ExportBounds::Selection, "Selection".to_string(), !self.has_selection),

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

@@ -26,11 +26,6 @@ impl MessageHandler<NewDocumentDialogMessage, ()> for NewDocumentDialogMessageHa
 
 				if !self.infinite && self.dimensions.x > 0 && self.dimensions.y > 0 {
 					let id = generate_uuid();
-					responses.add(ArtboardMessage::AddArtboard {
-						id: Some(id),
-						position: (0., 0.),
-						size: (self.dimensions.x as f64, self.dimensions.y as f64),
-					});
 					responses.add(GraphOperationMessage::NewArtboard {
 						id,
 						artboard: graphene_core::Artboard::new(IVec2::ZERO, self.dimensions.as_ivec2()),