From cb6a424586c0308d7824d99b4dd012576d68a856 Mon Sep 17 00:00:00 2001
From: Shah <aashay.as99@gmail.com>
Date: Wed, 13 Mar 2024 14:14:22 -0700
Subject: [PATCH 1/2] Update Graph View Overlay if it is open when switching
 documents

---
 .../messages/portfolio/document/document_message_handler.rs    | 3 +++
 editor/src/messages/portfolio/portfolio_message_handler.rs     | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs
index 15c9958acb..19981f8b1a 100644
--- a/editor/src/messages/portfolio/document/document_message_handler.rs
+++ b/editor/src/messages/portfolio/document/document_message_handler.rs
@@ -1125,6 +1125,9 @@ impl DocumentMessageHandler {
 	pub fn is_saved(&self) -> bool {
 		self.current_hash() == self.saved_hash
 	}
+	pub fn is_graph_overlay_open(&self) -> bool {
+		self.graph_view_overlay_open
+	}
 
 	pub fn set_auto_save_state(&mut self, is_saved: bool) {
 		if is_saved {
diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs
index 8c4d14e82d..b5716f59ca 100644
--- a/editor/src/messages/portfolio/portfolio_message_handler.rs
+++ b/editor/src/messages/portfolio/portfolio_message_handler.rs
@@ -430,6 +430,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 			}
 			PortfolioMessage::SelectDocument { document_id } => {
 				// Auto-save the document we are leaving
+				let mut send_overlay = false;
 				if let Some(document) = self.active_document() {
 					if !document.is_auto_saved() {
 						responses.add(PortfolioMessage::AutoSaveDocument {
@@ -437,6 +438,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 							document_id: self.active_document_id.unwrap(),
 						});
 					}
+					send_overlay = document.is_graph_overlay_open();
 				}
 
 				// Set the new active document ID
@@ -451,6 +453,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 				responses.add(PortfolioMessage::UpdateDocumentWidgets);
 				responses.add(NavigationMessage::TranslateCanvas { delta: (0., 0.).into() });
 				responses.add(NodeGraphMessage::RunDocumentGraph);
+				responses.add(DocumentMessage::GraphViewOverlay { open: send_overlay });
 			}
 			PortfolioMessage::SubmitDocumentExport {
 				file_name,

From 06a8e81c41e117aec74f00885cc674816c5f9bd0 Mon Sep 17 00:00:00 2001
From: Shah <aashay.as99@gmail.com>
Date: Fri, 15 Mar 2024 19:37:50 -0700
Subject: [PATCH 2/2] Resolve comments

---
 .../messages/portfolio/document/document_message_handler.rs | 1 +
 editor/src/messages/portfolio/portfolio_message_handler.rs  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs
index 19981f8b1a..b8873247a7 100644
--- a/editor/src/messages/portfolio/document/document_message_handler.rs
+++ b/editor/src/messages/portfolio/document/document_message_handler.rs
@@ -1125,6 +1125,7 @@ impl DocumentMessageHandler {
 	pub fn is_saved(&self) -> bool {
 		self.current_hash() == self.saved_hash
 	}
+
 	pub fn is_graph_overlay_open(&self) -> bool {
 		self.graph_view_overlay_open
 	}
diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs
index b5716f59ca..5f166b8fb0 100644
--- a/editor/src/messages/portfolio/portfolio_message_handler.rs
+++ b/editor/src/messages/portfolio/portfolio_message_handler.rs
@@ -430,7 +430,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 			}
 			PortfolioMessage::SelectDocument { document_id } => {
 				// Auto-save the document we are leaving
-				let mut send_overlay = false;
+				let mut node_graph_open = false;
 				if let Some(document) = self.active_document() {
 					if !document.is_auto_saved() {
 						responses.add(PortfolioMessage::AutoSaveDocument {
@@ -438,7 +438,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 							document_id: self.active_document_id.unwrap(),
 						});
 					}
-					send_overlay = document.is_graph_overlay_open();
+					node_graph_open = document.is_graph_overlay_open();
 				}
 
 				// Set the new active document ID
@@ -453,7 +453,7 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 				responses.add(PortfolioMessage::UpdateDocumentWidgets);
 				responses.add(NavigationMessage::TranslateCanvas { delta: (0., 0.).into() });
 				responses.add(NodeGraphMessage::RunDocumentGraph);
-				responses.add(DocumentMessage::GraphViewOverlay { open: send_overlay });
+				responses.add(DocumentMessage::GraphViewOverlay { open: node_graph_open });
 			}
 			PortfolioMessage::SubmitDocumentExport {
 				file_name,