Fix a bug that the methods of the GradientSynchronizer is not called …

…properly
Haruma-K · Apr 14, 2024 · f4c8d1f · f4c8d1f
1 parent 4989fb9
commit f4c8d1f
Show file tree

Hide file tree

Showing 19 changed files with 15 additions and 117 deletions.
diff --git a/Assets/uPalette/Editor/Core/PaletteEditor/PaletteEditorTreeView.cs b/Assets/uPalette/Editor/Core/PaletteEditor/PaletteEditorTreeView.cs
@@ -287,7 +287,13 @@ protected override void CellGUI(int columnIndex, Rect cellRect, RowGUIArgs args)
                 else
                 {
                     var themeId = _columnIndexToThemeIdMap[columnIndex];
-                    item.Values[themeId].Value = DrawValueField(cellRect, item.Values[themeId].Value);
+                    // For Gradient, use SetValueAndNotify to notify the change.
+                    using (var ccs = new EditorGUI.ChangeCheckScope())
+                    {
+                        var newValue = DrawValueField(cellRect, item.Values[themeId].Value);
+                        if (ccs.changed)
+                            item.Values[themeId].SetValueAndNotify(newValue);
+                    }
                 }
             }
         }

diff --git a/Assets/uPalette/Editor/Core/PaletteEditor/PaletteEditorWindowContentsViewController.cs b/Assets/uPalette/Editor/Core/PaletteEditor/PaletteEditorWindowContentsViewController.cs
@@ -108,8 +108,8 @@ void ObserveItemValue(KeyValuePair<string, ObservableProperty<T>> value)
                 {
                     var oldValue = entry.Values[themeId].Value;
                     _editService.Edit($"Set {typeof(T).Name} Entry Value {entry.Id}",
-                        () => { entry.Values[themeId].Value = x; },
-                        () => { entry.Values[themeId].Value = oldValue; });
+                        () => { entry.Values[themeId].SetValueAndNotify(x); },
+                        () => { entry.Values[themeId].SetValueAndNotify(oldValue); });
                 }).DisposeWith(disposables);
             }
 

diff --git a/Assets/uPalette/Runtime/Core/Model/Palette.cs b/Assets/uPalette/Runtime/Core/Model/Palette.cs
@@ -75,7 +75,7 @@ void ISerializationCallbackReceiver.OnAfterDeserialize()
                 var value = entry.Values[activeThemeId];
                 var colorProperty = new ObservableProperty<T>();
                 _activeValues[entry.Id] = colorProperty;
-                value.Subscribe(x => { colorProperty.Value = x; })
+                value.Subscribe(x => { colorProperty.SetValueAndNotify(x); })
                     .DisposeWith(_activeThemeDisposables);
             }
 
@@ -117,7 +117,7 @@ public void SetActiveTheme(string themeId)
             {
                 var valueProperty = _activeValues[entry.Id];
                 entry.Values[themeId]
-                    .Subscribe(x => valueProperty.Value = x)
+                    .Subscribe(x => valueProperty.SetValueAndNotify(x))
                     .DisposeWith(_activeThemeDisposables);
             }
 
@@ -284,7 +284,7 @@ internal Entry<T> AddEntry(string id)
                 {
                     var colorProperty = new ObservableProperty<T>();
                     _activeValues[entry.Id] = colorProperty;
-                    value.Subscribe(x => { colorProperty.Value = x; })
+                    value.Subscribe(x => { colorProperty.SetValueAndNotify(x); })
                         .DisposeWith(_activeThemeDisposables);
                 }
             }
@@ -356,7 +356,7 @@ public Entry<T> RestoreEntry(string removedEntryId)
                 {
                     var colorProperty = new ObservableProperty<T>();
                     _activeValues[removedEntry.Id] = colorProperty;
-                    value.Subscribe(x => { colorProperty.Value = x; })
+                    value.Subscribe(x => { colorProperty.SetValueAndNotify(x); })
                         .DisposeWith(_activeThemeDisposables);
                 }
             }

diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/CharacterStyle/TextCharacterStyleSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/CharacterStyle/TextCharacterStyleSynchronizer.cs
@@ -18,26 +18,13 @@ protected internal override Foundation.CharacterStyles.CharacterStyle GetValue()
                 lineSpacing = Component.lineSpacing
             };
         }
-
-        private static int _latestRepaintFrame;
-
+
         protected internal override void SetValue(Foundation.CharacterStyles.CharacterStyle value)
         {
             Component.font = value.font;
             Component.fontStyle = value.fontStyle;
             Component.fontSize = value.fontSize;
             Component.lineSpacing = value.lineSpacing;
         }
-
-        protected override bool EqualsToCurrentValue(Foundation.CharacterStyles.CharacterStyle value)
-        {
-            if (Component.font != value.font
-                || Component.fontStyle != value.fontStyle
-                || Component.fontSize != value.fontSize
-                || Component.lineSpacing != value.lineSpacing)
-                return false;
-
-            return true;
-        }
     }
 }
diff --git a/...ntime/Core/Synchronizer/CharacterStyleTMP/TextMeshProUGUICharacterStyleTMPSynchronizer.cs b/...ntime/Core/Synchronizer/CharacterStyleTMP/TextMeshProUGUICharacterStyleTMPSynchronizer.cs
@@ -7,8 +7,6 @@ namespace uPalette.Runtime.Core.Synchronizer.CharacterStyleTMP
     [CharacterStyleTMPSynchronizer(typeof(TextMeshProUGUI), "Character Style")]
     public sealed class TextMeshProUGUICharacterStyleTMPSynchronizer : CharacterStyleTMPSynchronizer<TextMeshProUGUI>
     {
-        private static int _latestRepaintFrame;
-
         protected internal override Foundation.CharacterStyles.CharacterStyleTMP GetValue()
         {
             return new Foundation.CharacterStyles.CharacterStyleTMP
@@ -46,30 +44,5 @@ protected internal override void SetValue(Foundation.CharacterStyles.CharacterSt
             Component.lineSpacing = value.lineSpacing;
             Component.paragraphSpacing = value.paragraphSpacing;
         }
-
-        protected override bool EqualsToCurrentValue(Foundation.CharacterStyles.CharacterStyleTMP value)
-        {
-            if (Component.font != null && Component.font.sourceFontFile != value.font.sourceFontFile)
-            {
-                return false;
-            }
-
-            var isNotEquals = Component.fontStyle != value.fontStyle
-                              || Component.enableAutoSizing != value.enableAutoSizing
-                              || Component.fontSize != value.fontSize
-                              || Component.characterSpacing != value.characterSpacing
-                              || Component.wordSpacing != value.wordSpacing
-                              || Component.lineSpacing != value.lineSpacing
-                              || Component.paragraphSpacing != value.paragraphSpacing;
-
-            if (value.enableAutoSizeOptions)
-                isNotEquals = isNotEquals
-                              || Component.fontSizeMin != value.fontSizeMin
-                              || Component.fontSizeMax != value.fontSizeMax
-                              || Component.characterWidthAdjustment != value.characterWidthAdjustment
-                              || Component.lineSpacingAdjustment != value.lineSpacingAdjustment;
-
-            return !isNotEquals;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/GraphicColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/GraphicColorSynchronizer.cs
@@ -16,10 +16,5 @@ protected internal override void SetValue(UnityEngine.Color value)
         {
             Component.color = value;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.color == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/InputFieldCaretColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/InputFieldCaretColorSynchronizer.cs
@@ -17,10 +17,5 @@ protected internal override void SetValue(UnityEngine.Color value)
             Component.customCaretColor = true;
             Component.caretColor = value;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.caretColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/InputFieldSelectionColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/InputFieldSelectionColorSynchronizer.cs
@@ -16,10 +16,5 @@ protected internal override void SetValue(UnityEngine.Color value)
         {
             Component.selectionColor = value;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.selectionColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/OutlineColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/OutlineColorSynchronizer.cs
@@ -16,10 +16,5 @@ protected internal override void SetValue(UnityEngine.Color value)
         {
             Component.effectColor = value;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.effectColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableDisabledColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableDisabledColorSynchronizer.cs
@@ -18,10 +18,5 @@ protected internal override void SetValue(UnityEngine.Color value)
             colors.disabledColor = value;
             Component.colors = colors;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.colors.disabledColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableHighlightedColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableHighlightedColorSynchronizer.cs
@@ -18,10 +18,5 @@ protected internal override void SetValue(UnityEngine.Color value)
             colors.highlightedColor = value;
             Component.colors = colors;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.colors.highlightedColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableNormalColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableNormalColorSynchronizer.cs
@@ -18,10 +18,5 @@ protected internal override void SetValue(UnityEngine.Color value)
             colors.normalColor = value;
             Component.colors = colors;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.colors.normalColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectablePressedColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectablePressedColorSynchronizer.cs
@@ -18,10 +18,5 @@ protected internal override void SetValue(UnityEngine.Color value)
             colors.pressedColor = value;
             Component.colors = colors;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.colors.pressedColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableSelectedColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/SelectableSelectedColorSynchronizer.cs
@@ -18,10 +18,5 @@ protected internal override void SetValue(UnityEngine.Color value)
             colors.selectedColor = value;
             Component.colors = colors;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.colors.selectedColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/TMPInputFieldCaretColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/TMPInputFieldCaretColorSynchronizer.cs
@@ -17,10 +17,5 @@ protected internal override void SetValue(UnityEngine.Color value)
             Component.customCaretColor = true;
             Component.caretColor = value;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.caretColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/Color/TMPInputFieldSelectionColorSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/Color/TMPInputFieldSelectionColorSynchronizer.cs
@@ -16,10 +16,5 @@ protected internal override void SetValue(UnityEngine.Color value)
         {
             Component.selectionColor = value;
         }
-
-        protected override bool EqualsToCurrentValue(UnityEngine.Color value)
-        {
-            return Component.selectionColor == value;
-        }
     }
 }
diff --git a/Assets/uPalette/Runtime/Core/Synchronizer/ValueSynchronizer.cs b/Assets/uPalette/Runtime/Core/Synchronizer/ValueSynchronizer.cs
@@ -9,12 +9,9 @@ public abstract class ValueSynchronizer<T> : ValueSynchronizerBase<T>
 
         protected internal abstract void SetValue(T value);
 
-        protected abstract bool EqualsToCurrentValue(T value);
-
         protected override void OnValueChanged(T value)
         {
-            if (!EqualsToCurrentValue(value))
-                SetValue(value);
+            SetValue(value);
         }
     }
 }
diff --git a/README.md b/README.md
@@ -446,11 +446,6 @@ public sealed class GraphicColorSynchronizer : GradientSynchronizer<SampleGradie
     {
         _component.Gradient = value;
     }
-
-    protected override bool EqualsToCurrentValue(Gradient value)
-    {
-        return _component.Gradient.Equals(value);
-    }
 }
 ```
 

diff --git a/README_JA.md b/README_JA.md
@@ -475,11 +475,6 @@ public sealed class GraphicColorSynchronizer : GradientSynchronizer<SampleGradie
     {
         _component.Gradient = value;
     }
-
-    protected override bool EqualsToCurrentValue(Gradient value)
-    {
-        return _component.Gradient.Equals(value);
-    }
 }
 ```
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             _component.Gradient = value;
         }
-        protected override bool EqualsToCurrentValue(Gradient value)
-        {
-            return _component.Gradient.Equals(value);
-        }
     }
     ```
@@ Expand Down @@