DataBinding -> ThemeBinding

Author: keveleigh

org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs

@@ -12,7 +12,7 @@ namespace MixedReality.Toolkit.Theming
     /// </summary>
     /// <remarks>
     /// Add one of these binders per state (or per state+effect combination) to a
-    /// <see cref="DataBinding"/> component. Each binder reads a <c>Color</c> from the
+    /// <see cref="ThemeBinding"/> component. Each binder reads a <c>Color</c> from the
     /// active theme and routes it to the matching tint effect via
     /// <see cref="StateVisualizer.TrySetStateTintColor(string, UnityEngine.Object, Color)"/>.
     /// <para/>

…tytoolkit.theming/Theming/DataBinding.cs …ytoolkit.theming/Theming/ThemeBinding.csorg.mixedrealitytoolkit.theming/Theming/DataBinding.cs renamed to org.mixedrealitytoolkit.theming/Theming/ThemeBinding.cs org.mixedrealitytoolkit.theming/Theming/DataBinding.cs renamed to org.mixedrealitytoolkit.theming/Theming/ThemeBinding.cs

@@ -5,7 +5,7 @@
 
 namespace MixedReality.Toolkit.Theming
 {
-    public class DataBinding : MonoBehaviour
+    public class ThemeBinding : MonoBehaviour
     {
         [SerializeField]
         [Tooltip("The theme data source manager.")]
@@ -19,21 +19,21 @@ protected void OnEnable()
         {
             if (themeDataSource == null)
             {
-                Debug.LogWarning($"{nameof(DataBinding)} on '{gameObject.name}' has no {nameof(ThemeDataSource)} assigned.", this);
+                Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has no {nameof(ThemeDataSource)} assigned.", this);
                 return;
             }
 
             foreach (IBinder binder in binders)
             {
                 if (binder == null)
                 {
-                    Debug.LogWarning($"{nameof(DataBinding)} on '{gameObject.name}' has a null binder entry.", this);
+                    Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has a null binder entry.", this);
                     continue;
                 }
 
                 if (string.IsNullOrWhiteSpace(binder.ThemeDefinitionItemName))
                 {
-                    Debug.LogWarning($"{nameof(DataBinding)} on '{gameObject.name}' has a {binder.GetType().Name} with no theme item assigned.", this);
+                    Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has a {binder.GetType().Name} with no theme item assigned.", this);
                 }
 
                 binder.Subscribe(themeDataSource);

…lkit.theming/Theming/DataBinding.cs.meta …kit.theming/Theming/ThemeBinding.cs.metaorg.mixedrealitytoolkit.theming/Theming/DataBinding.cs.meta renamed to org.mixedrealitytoolkit.theming/Theming/ThemeBinding.cs.meta org.mixedrealitytoolkit.theming/Theming/DataBinding.cs.meta renamed to org.mixedrealitytoolkit.theming/Theming/ThemeBinding.cs.meta

@@ -8,7 +8,7 @@
 namespace MixedReality.Toolkit.Theming
 {
     [CreateAssetMenu(fileName = "Theme Data Source", menuName = "MRTK/Theming/Theme Data Source", order = 0)]
-    public class ThemeDataSource : ScriptableObject, IBindable, INotifyValueChanged<Theme>, IEventHandler
+    public class ThemeDataSource : ScriptableObject, INotifyValueChanged<Theme>
     {
         [SerializeField]
         private Theme activeTheme;
@@ -19,15 +19,9 @@ public class ThemeDataSource : ScriptableObject, IBindable, INotifyValueChanged<
         [SerializeField]
         private ThemeDefinition themeDefinition;
 
-        #region IBindable
-
-        IBinding IBindable.binding { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
-        string IBindable.bindingPath { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
-
-        #endregion IBindable
-
         #region INotifyValueChanged<Theme>
 
+        /// <inheritdoc/>
         public Theme value
         {
             get => activeTheme;
@@ -40,47 +34,41 @@ public Theme value
 
                 using (ChangeEvent<Theme> changeEvent = ChangeEvent<Theme>.GetPooled(activeTheme, value))
                 {
-                    changeEvent.target = this;
+                    // target is intentionally unset, as ThemeDataSource is not a UIElements visual
+                    // element, but ChangeEvent<T> is used for its newValue/previousValue semantics
+                    // and object pooling
                     SetValueWithoutNotify(value);
                     SendEvent(changeEvent);
                 }
             }
         }
 
+        /// <inheritdoc/>
         public void SetValueWithoutNotify(Theme newValue)
         {
             activeTheme = newValue;
         }
 
         #endregion INotifyValueChanged<Theme>
 
-        #region IEventHandler
-
-        public void SendEvent(EventBase e)
-        {
-            if (e is ChangeEvent<Theme> changeEvent)
-            {
-                onThemeChanged.Invoke(changeEvent);
-            }
-        }
-
-        void IEventHandler.HandleEvent(EventBase evt) { }
-        bool IEventHandler.HasTrickleDownHandlers() => false;
-        bool IEventHandler.HasBubbleUpHandlers() => false;
-
-        #endregion IEventHandler
-
         public void AddListener(UnityAction<ChangeEvent<Theme>> action)
         {
             onThemeChanged.AddListener(action);
             using ChangeEvent<Theme> changeEvent = ChangeEvent<Theme>.GetPooled(null, activeTheme);
-            changeEvent.target = this;
             SendEvent(changeEvent);
         }
 
         public void RemoveListener(UnityAction<ChangeEvent<Theme>> action)
         {
             onThemeChanged.RemoveListener(action);
         }
+
+        private void SendEvent(EventBase e)
+        {
+            if (e is ChangeEvent<Theme> changeEvent)
+            {
+                onThemeChanged.Invoke(changeEvent);
+            }
+        }
     }
 }