feat: check scene is dirty

dogukanerkut · Mar 26, 2023 · f5f485e · f5f485e
1 parent b019b2f
commit f5f485e
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 96 deletions.
diff --git a/BookmarkEverything/Assets/BookmarkEverything/Editor/BookmarkEverythingEditor.cs b/BookmarkEverything/Assets/BookmarkEverything/Editor/BookmarkEverythingEditor.cs
@@ -7,12 +7,9 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using JD.AssetizerEditor;
 using UnityEditor;
 using UnityEditor.SceneManagement;
-using UnityEditor.UIElements;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 using Object = UnityEngine.Object;
 
 #endregion
@@ -558,19 +555,18 @@ private void DrawInnerSettings()
 
             label                    = "OpenAsProperties";
             _controlOpenAsProperties = _openAsProperties;
-            _openAsProperties        = EditorGUILayout.Toggle(label , _openAsProperties);
+            // _openAsProperties        = EditorGUILayout.Toggle(label , _openAsProperties);
 
             // if (_controlOpenAsProperties != _openAsProperties)
             // {
             //     _visualModeChanged = true;
             // }
 
-            Debug.Log($"{_openAsProperties}");
-            if (_controlOpenAsProperties != _openAsProperties)
-            {
-                _currentSettings.OpenAsProperties = _openAsProperties;
-                _currentSettings.Save();
-            }
+            // if (_controlOpenAsProperties != _openAsProperties)
+            // {
+            //     _currentSettings.OpenAsProperties = _openAsProperties;
+            //     _currentSettings.Save();
+            // }
 
             // label              = "Visual Mode(Experimental!) : ";
             // _controlVisualMode = _visualMode;
@@ -687,15 +683,12 @@ private void DrawProjectFinderEntries(string category)
                                     Selection.activeObject = asset;
                                     if (_openAsProperties)
                                     {
-                                        OpenPropertiesEditorWindowDoubleClickListener.OpenInPropertyEditor(asset);
-                                    }
-                                    else
-                                    {
-                                        var entryIsScene = asset is SceneAsset;
-                                        var prefabType   = PrefabUtility.GetPrefabType(asset);
-                                        if (entryIsScene) SaveSceneDialog(path);
-                                        else if (prefabType == PrefabType.Prefab) AssetDatabase.OpenAsset(asset);
+                                        // OpenPropertiesEditorWindowDoubleClickListener.OpenInPropertyEditor(asset);
                                     }
+                                    var entryIsScene = asset is SceneAsset;
+                                    var prefabType   = PrefabUtility.GetPrefabType(asset);
+                                    if (entryIsScene) SaveSceneDialog(path);
+                                    else if (prefabType == PrefabType.Prefab) AssetDatabase.OpenAsset(asset);
                                 }
                                 else OpenDir(path);
                             }
@@ -750,6 +743,12 @@ private void DrawProjectFinderEntries(string category)
 
         private static void SaveSceneDialog(string scenePath)
         {
+            var sceneIsDirty = EditorSceneManager.GetActiveScene().isDirty;
+            if (sceneIsDirty == false)
+            {
+                EditorSceneManager.OpenScene(scenePath , OpenSceneMode.Single);
+                return;
+            }
             var option = EditorUtility.DisplayDialogComplex(
                     "Unsaved scene Changes" ,
                     "Do you want to save the changes you made before load new scene?" ,

diff --git a/...rything/Assets/BookmarkEverything/Editor/OpenPropertiesEditorWindowDoubleClickListener.cs b/...rything/Assets/BookmarkEverything/Editor/OpenPropertiesEditorWindowDoubleClickListener.cs
diff --git a/...ng/Assets/BookmarkEverything/Editor/OpenPropertiesEditorWindowDoubleClickListener.cs.meta b/...ng/Assets/BookmarkEverything/Editor/OpenPropertiesEditorWindowDoubleClickListener.cs.meta
diff --git a/BookmarkEverything/Assets/Samples.meta b/BookmarkEverything/Assets/Samples.meta
diff --git a/BookmarkEverything/Assets/Samples/SO.asset b/BookmarkEverything/Assets/Samples/SO.asset
@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66fa9eb72cb841498e13510e0ec7ab87, type: 3}
+  m_Name: SO
+  m_EditorClassIdentifier: 
diff --git a/BookmarkEverything/Assets/Samples/SO.asset.meta b/BookmarkEverything/Assets/Samples/SO.asset.meta
diff --git a/BookmarkEverything/Assets/Samples/SO.cs b/BookmarkEverything/Assets/Samples/SO.cs
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+namespace Samples
+{
+    [UnityEngine.CreateAssetMenu(fileName = "SO" , menuName = "SO" , order = 0)]
+    public class SO : ScriptableObject
+    {
+
+    }
+}
diff --git a/BookmarkEverything/Assets/Samples/SO.cs.meta b/BookmarkEverything/Assets/Samples/SO.cs.meta