Use select_after_open

Author: timon-schelling

desktop/src/app.rs

@@ -181,24 +181,34 @@ impl WinitApp {
 			}
 			DesktopFrontendMessage::PersistenceLoadCurrentDocument => {
 				if let Some((id, document)) = self.persistent_data.current_document() {
-					let message = DesktopWrapperMessage::LoadDocument { id, document, to_front: false };
-					self.dispatch_desktop_wrapper_message(message);
-
-					let message = DesktopWrapperMessage::SelectDocument { id };
+					let message = DesktopWrapperMessage::LoadDocument {
+						id,
+						document,
+						to_front: false,
+						select_after_open: true,
+					};
 					self.dispatch_desktop_wrapper_message(message);
 				}
 			}
 			DesktopFrontendMessage::PersistenceLoadRemainingDocuments => {
 				for (id, document) in self.persistent_data.documents_before_current().into_iter().rev() {
-					let message = DesktopWrapperMessage::LoadDocument { id, document, to_front: true };
+					let message = DesktopWrapperMessage::LoadDocument {
+						id,
+						document,
+						to_front: true,
+						select_after_open: false,
+					};
 					self.dispatch_desktop_wrapper_message(message);
 				}
-
 				for (id, document) in self.persistent_data.documents_after_current() {
-					let message = DesktopWrapperMessage::LoadDocument { id, document, to_front: false };
+					let message = DesktopWrapperMessage::LoadDocument {
+						id,
+						document,
+						to_front: false,
+						select_after_open: false,
+					};
 					self.dispatch_desktop_wrapper_message(message);
 				}
-
 				if let Some(id) = self.persistent_data.current_document_id() {
 					let message = DesktopWrapperMessage::SelectDocument { id };
 					self.dispatch_desktop_wrapper_message(message);

desktop/wrapper/src/handle_desktop_wrapper_message.rs

@@ -118,7 +118,12 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 			let message = AppWindowMessage::AppWindowUpdatePlatform { platform };
 			dispatcher.queue_editor_message(message.into());
 		}
-		DesktopWrapperMessage::LoadDocument { id, document, to_front } => {
+		DesktopWrapperMessage::LoadDocument {
+			id,
+			document,
+			to_front,
+			select_after_open,
+		} => {
 			let message = PortfolioMessage::OpenDocumentFileWithId {
 				document_id: id,
 				document_name: Some(document.name),
@@ -127,7 +132,7 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 				document_is_auto_saved: true,
 				document_is_saved: document.is_saved,
 				to_front,
-				select_after_open: false,
+				select_after_open,
 			};
 			dispatcher.queue_editor_message(message.into());
 		}

desktop/wrapper/src/messages.rs

@@ -53,16 +53,43 @@ pub enum DesktopFrontendMessage {
 
 pub enum DesktopWrapperMessage {
 	FromWeb(Box<EditorMessage>),
-	OpenFileDialogResult { path: PathBuf, content: Vec<u8>, context: OpenFileDialogContext },
-	SaveFileDialogResult { path: PathBuf, context: SaveFileDialogContext },
-	OpenDocument { path: PathBuf, content: Vec<u8> },
-	OpenFile { path: PathBuf, content: Vec<u8> },
-	ImportFile { path: PathBuf, content: Vec<u8> },
-	ImportSvg { path: PathBuf, content: Vec<u8> },
-	ImportImage { path: PathBuf, content: Vec<u8> },
+	OpenFileDialogResult {
+		path: PathBuf,
+		content: Vec<u8>,
+		context: OpenFileDialogContext,
+	},
+	SaveFileDialogResult {
+		path: PathBuf,
+		context: SaveFileDialogContext,
+	},
+	OpenDocument {
+		path: PathBuf,
+		content: Vec<u8>,
+	},
+	OpenFile {
+		path: PathBuf,
+		content: Vec<u8>,
+	},
+	ImportFile {
+		path: PathBuf,
+		content: Vec<u8>,
+	},
+	ImportSvg {
+		path: PathBuf,
+		content: Vec<u8>,
+	},
+	ImportImage {
+		path: PathBuf,
+		content: Vec<u8>,
+	},
 	PollNodeGraphEvaluation,
 	UpdatePlatform(Platform),
-	LoadDocument { id: DocumentId, document: Document, to_front: bool },
+	LoadDocument {
+		id: DocumentId,
+		document: Document,
+		to_front: bool,
+		select_after_open: bool,
+	},
 	SelectDocument { id: DocumentId },
 }