Save/Save As tweaks (#3495)

* Fix default %project%/Assets/ location when saving prefabs + scenes
* Display error message box if it's not a valid assets location
* Tweak "File > Save" enabled conditions to match if they'll do something

Author: solwllms

engine/Sandbox.Tools/Editor/EditorMainWindow.cs

@@ -101,6 +101,7 @@ public void ShowCloseDialog()
 
 	private Option save;
 	private Option saveAs;
+	private Option saveAll;
 	private Option discard;
 	private Option undoOption;
 	private Option redoOption;
@@ -124,7 +125,7 @@ internal EditorMainWindow()
 			FileMenu.AddSeparator();
 			save = FileMenu.AddOption( "Save", "save", EditorScene.SaveSession, "editor.save" );
 			saveAs = FileMenu.AddOption( "Save As..", "save_as", EditorScene.SaveSessionAs, "editor.save-as" );
-			FileMenu.AddOption( "Save All", null, EditorScene.SaveAllSessions, "editor.save-all" );
+			saveAll = FileMenu.AddOption( "Save All", null, EditorScene.SaveAllSessions, "editor.save-all" );
 			discard = FileMenu.AddOption( "Discard Changes", "auto_delete", EditorScene.Discard );
 			FileMenu.AddSeparator();
 			FileMenu.AddOption( "Close Project", "disabled_by_default", () => { showLauncherOnExit = true; Quit(); } );
@@ -488,8 +489,9 @@ public void SetVisible( bool visible )
 
 	private void OnFileMenuAboutToShow()
 	{
-		save.Enabled = SceneEditorSession.Active?.HasUnsavedChanges ?? true;
-		saveAs.Enabled = SceneEditorSession.Active?.HasUnsavedChanges ?? true;
+		save.Enabled = SceneEditorSession.Active?.HasUnsavedChanges ?? false;
+		saveAs.Enabled = SceneEditorSession.Active is not null;
+		saveAll.Enabled = SceneEditorSession.All.Any();
 		discard.Enabled = SceneEditorSession.Active?.HasUnsavedChanges ?? false;
 	}
 

engine/Sandbox.Tools/Scene/Session/SceneEditorSession.cs

@@ -1,6 +1,7 @@
 using Facepunch.ActionGraphs;
 using Sandbox.ActionGraphs;
 using System;
+using System.IO;
 
 namespace Editor;
 
@@ -305,62 +306,49 @@ public void Reload()
 	public void Save( bool saveAs )
 	{
 		bool isPrefab = Scene is PrefabScene;
-		var saveLocation = string.Empty;
+		string extension = isPrefab ? "prefab" : "scene";
+		string fileType = isPrefab ? "Prefab" : "Scene";
 
-		if ( Scene.Source is not null && AssetSystem.FindByPath( Scene.Source.ResourcePath ) is Asset sourceAsset )
+		var saveLocation = string.Empty;
+		if ( !saveAs && Scene.Source is not null && AssetSystem.FindByPath( Scene.Source.ResourcePath ) is Asset sourceAsset )
 		{
 			saveLocation = sourceAsset.AbsolutePath;
 		}
 		else
 		{
-			saveAs = true;
-		}
-
-		string extension = isPrefab ? "prefab" : "scene";
-		string fileType = isPrefab ? "Prefab" : "Scene";
-
-		if ( saveAs )
-		{
-			if ( string.IsNullOrEmpty( saveLocation ) )
+			saveLocation = ProjectCookie.GetString( $"LastSaveLocation.{extension}", string.Empty );
+			if ( !Directory.Exists( saveLocation ) )
 			{
-				saveLocation = System.IO.Path.Combine(
-					System.IO.Path.GetDirectoryName( ProjectCookie.GetString( $"LastSaveLocation.{extension}", Project.Current.GetAssetsPath() ) ),
-					$"untitled.{extension}" );
+				saveLocation = Project.Current.GetAssetsPath();
 			}
 
-			saveLocation = EditorUtility.SaveFileDialog( $"Save {fileType} As..", extension, saveLocation );
-
+			saveLocation = EditorUtility.SaveFileDialog( $"Save {fileType} As..", extension,
+				Path.Combine( saveLocation, $"untitled.{extension}" ) );
 			if ( saveLocation is null )
 				return;
 
-			ProjectCookie.SetString( $"LastSaveLocation.{extension}", System.IO.Path.GetDirectoryName( saveLocation ) );
-		}
+			if ( !saveLocation.NormalizeFilename( false ).StartsWith( Project.Current.GetAssetsPath().NormalizeFilename( false ) ) )
+			{
+				// enforce saving inside Assets/ - if it's outside, complain and let them retry
+				EditorUtility.DisplayDialog( $"Save Failed: Invalid location",
+					$"{fileType}s must be saved inside the Assets folder of your project", "Cancel", "Retry",
+					() => Save( true ) );
+				return;
+			}
 
-		EditorEvent.Run( "scene.beforesave", SceneEditorSession.Active.Scene );
+			ProjectCookie.SetString( $"LastSaveLocation.{extension}", Path.GetDirectoryName( saveLocation ) );
+		}
 
-		if ( Scene is PrefabScene prefabScene )
-		{
-			var prefabFile = prefabScene.ToPrefabFile();
-			var asset = AssetSystem.CreateResource( "prefab", saveLocation );
-			asset.SaveToDisk( prefabFile );
+		EditorEvent.Run( "scene.beforesave", Active.Scene );
 
-			// Update this scene's path
-			Scene.Source = prefabFile;
-			Scene.Name = System.IO.Path.GetFileNameWithoutExtension( saveLocation );
-		}
-		else
-		{
-			var sceneFile = Scene.CreateSceneFile();
-			var asset = AssetSystem.CreateResource( "scene", saveLocation );
-			asset.SaveToDisk( sceneFile );
+		var asset = AssetSystem.CreateResource( extension, saveLocation );
+		Assert.NotNull( asset, $"Failed to CreateResource for {fileType} at {saveLocation}" );
 
-			// Update this scene's path
-			Scene.Source = sceneFile;
-			Scene.Name = System.IO.Path.GetFileNameWithoutExtension( saveLocation );
-		}
+		GameResource resource = Scene is PrefabScene prefabScene ? prefabScene.ToPrefabFile() : Scene.CreateSceneFile();
+		asset.SaveToDisk( resource );
 
 		HasUnsavedChanges = false;
-		EditorEvent.Run( "scene.saved", SceneEditorSession.Active.Scene );
+		EditorEvent.Run( "scene.saved", Active.Scene );
 
 		UpdateEditorTitle();
 	}