Marking as dirty after applying changes

Author: IvanMurzak

Assets/_PackageRoot/Editor/Scripts/ThemeDataEditor.cs

@@ -16,6 +16,7 @@ public bool SetColor(ColorData colorData)
                 return false;
             }
             data.colorGuid = colorData.Guid;
+            SetDirty();
             var color = GetColor(colorData);
 
             if (Theme.Instance?.debugLevel <= DebugLevel.Log)

Assets/_PackageRoot/Editor/Scripts/ThemeDataEditor.cs.meta

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace Unity.Theme.Binders
@@ -8,24 +8,28 @@ public abstract partial class BaseColorBinder : MonoBehaviour
     {
         [SerializeField] protected ColorBinderData data;
 
+        protected virtual IEnumerable<Object> ColorTargets { get; } = null;
+
         protected virtual void Awake()
         {
             if (data == null)
             {
                 if (Theme.Instance?.debugLevel <= DebugLevel.Error)
-                    Debug.LogError($"ColorBinderData is null at gameObject {name}", gameObject);
-                data = new ColorBinderData()
-                {
-                    colorGuid = Theme.Instance?.GetColorFirst().Guid
-                };
+                    Debug.LogError($"ColorBinderData is null at <b>{GameObjectPath()}</b>, replacing it by first color", gameObject);
+
+                data = new ColorBinderData() { colorGuid = Theme.Instance?.GetColorFirst().Guid };
+                SetDirty();
             }
             if (!data.IsConnected)
             {
                 if (Theme.Instance?.debugLevel <= DebugLevel.Error)
-                    Debug.LogError($"Color not found in database. Guid={data.colorGuid}", gameObject);
+                    Debug.LogError($"Color not found in database at <b>{GameObjectPath()}</b> Guid={data.colorGuid}", gameObject);
                 var colorData = Theme.Instance?.GetColorFirst();
                 if (colorData != null)
+                {
                     data.colorGuid = colorData.Guid;
+                    SetDirty();
+                }
                 else
                 {
                     if (Theme.Instance?.debugLevel <= DebugLevel.Error)
@@ -47,6 +51,15 @@ protected virtual void OnDisable()
             Theme.Instance.onThemeChanged -= TrySetColor;
             Theme.Instance.onThemeColorChanged -= OnThemeColorChanged;
         }
+        protected virtual void SetDirty()
+        {
+            SetDirty(this);
+            if (ColorTargets != null)
+            {
+                foreach (var target in ColorTargets)
+                    SetDirty(target);
+            }
+        }
         protected virtual void TrySetColor(ThemeData theme)
         {
             if (theme == null)
@@ -74,18 +87,21 @@ protected virtual void TrySetColor(ThemeData theme)
 #if UNITY_EDITOR
         private void OnValidate()
         {
-            // Attaching to first color
             if (string.IsNullOrEmpty(data.colorGuid))
             {
                 if (Theme.Instance?.debugLevel <= DebugLevel.Error)
                     Debug.LogError($"colorGuid is null at: <b>{GameObjectPath()}</b>. Taking the first one available.", gameObject);
+
                 data.colorGuid = Theme.Instance?.GetColorFirst().Guid;
+                SetDirty();
             }
             if (!data.IsConnected)
             {
                 if (Theme.Instance?.debugLevel <= DebugLevel.Error)
                     Debug.LogError($"colorGuid='{data.colorGuid}' doesn't match to any existed colors at: <b>{GameObjectPath()}</b>. Taking the first one available.", gameObject);
+
                 data.colorGuid = Theme.Instance?.GetColorFirst().Guid;
+                SetDirty();
             }
 
             TrySetColor(Theme.Instance.CurrentTheme);
@@ -102,10 +118,16 @@ protected virtual Color GetColor(ColorData colorData)
         }
         protected abstract void SetColor(Color color);
 
-        private void OnThemeColorChanged(ThemeData themeData, ColorData colorData)
+        private void SetDirty(Object obj)
         {
-            TrySetColor(Theme.Instance.CurrentTheme);
+#if UNITY_EDITOR
+            if (UnityEditor.PrefabUtility.IsPartOfAnyPrefab(obj))
+                UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(obj);
+            else
+                UnityEditor.EditorUtility.SetDirty(obj);
+#endif
         }
+        private void OnThemeColorChanged(ThemeData themeData, ColorData colorData) => TrySetColor(Theme.Instance.CurrentTheme);
         // UTILS ---------------------------------------------------------------------------//
         protected string GameObjectPath() => GameObjectPath(transform);                     //
         protected static string GameObjectPath(Transform trans, string path = "")           //

Assets/_PackageRoot/Scripts/Binders/BaseColorBinder.Public.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -8,6 +9,8 @@ public class ImageColorBinder : BaseColorBinder
     {
         [SerializeField] Image image;
 
+        protected override IEnumerable<Object> ColorTargets { get { yield return image; } }
+
         protected override void Awake()
         {
             if (image == null) image = GetComponent<Image>();

Assets/_PackageRoot/Scripts/Binders/BaseColorBinder.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace Unity.Theme.Binders
@@ -7,6 +8,8 @@ public class SpriteRendererColorBinder : BaseColorBinder
     {
         [SerializeField] SpriteRenderer spriteRenderer;
 
+        protected override IEnumerable<Object> ColorTargets { get { yield return spriteRenderer; } }
+
         protected override void Awake()
         {
             if (spriteRenderer == null) spriteRenderer = GetComponent<SpriteRenderer>();

Assets/_PackageRoot/Scripts/Binders/ImageColorBinder.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using TMPro;
+using System.Collections.Generic;
 
 namespace Unity.Theme.Binders
 {
@@ -8,6 +9,8 @@ public class TextMeshProColorBinder : BaseColorBinder
     {
         [SerializeField] TextMeshProUGUI textMeshPro;
 
+        protected override IEnumerable<Object> ColorTargets { get { yield return textMeshPro; } }
+
         protected override void Awake()
         {
             if (textMeshPro == null) textMeshPro = GetComponent<TextMeshProUGUI>();

Assets/_PackageRoot/Scripts/Binders/SpriteRendererColorBinder.cs

@@ -10,8 +10,7 @@ public  static Theme Instance
         {
             get
             {
-                if (instance == null)
-                    instance = GetOrCreateInstance();
+                instance ??= GetOrCreateInstance();
 
                 if (instance == null)
                     Debug.LogError("Theme instance is null");

Assets/_PackageRoot/Scripts/Binders/TextMeshProColorBinder.cs

@@ -34,17 +34,12 @@ public string              CurrentThemeName
 
         public ThemeData AddTheme(string themeName, bool setCurrent = false)
         {
-            List<ColorData> colors;
-            if (themes.Count > 0)
-            {
-                colors = themes[0].colors
+            var colors = themes.Count == 0
+                ? new List<ColorData>()
+                : themes[0].colors
                     .Select(c => new ColorData(c))
                     .ToList();
-            }
-            else
-            {
-                colors = new List<ColorData>();
-            }
+
             var theme = new ThemeData(Guid.NewGuid().ToString())
             {
                 themeName = themeName,
@@ -59,9 +54,7 @@ public ThemeData AddTheme(string themeName, bool setCurrent = false)
         }
         public ThemeData SetOrAddTheme(string themeName, bool setCurrent = false)
         {
-            var theme = themes.FirstOrDefault(x => x.themeName == themeName);
-            if (theme == null)
-                theme = AddTheme(themeName, setCurrent);
+            var theme = themes.FirstOrDefault(x => x.themeName == themeName) ?? AddTheme(themeName, setCurrent);
             if (setCurrent)
                 CurrentThemeIndex = themes.IndexOf(theme);
             return theme;

Assets/_PackageRoot/Scripts/Config/Theme.Singleton.cs

@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;