added suppressing setting points to < 4 count on polygon

vchelaru · Dec 22, 2024 · c5d76ca · c5d76ca
1 parent cd59e25
commit c5d76ca
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 37 deletions.
diff --git a/Gum/DataTypes/StateSaveExtensionMethods.cs b/Gum/DataTypes/StateSaveExtensionMethods.cs
@@ -514,39 +514,7 @@ public static void SetValue(this StateSave stateSave, string variableName, objec
                 {
                     exposedVariableSourceName = coreVariableDefinition.Name;
                 }
-                bool isFile = false;
-
-                // Why might instanceSave be null?
-                // The reason is because StateSaves
-                // are used both for actual game data
-                // as well as temporary variable containers.
-                // If a StateSave is a temporary container then
-                // instanceSave may (probably will be) null.
-                if (instanceSave != null)
-                {
-                    VariableSave temp = variableSave;
-                    if (variableSave == null)
-                    {
-                        temp = new VariableSave();
-                        temp.Name = variableName;
-                    }
-                    isFile = temp.GetIsFileFromRoot(instanceSave);
-                }
-                else
-                {
-                    VariableSave temp = variableSave;
-                    if (variableSave == null)
-                    {
-                        temp = new VariableSave();
-                        temp.Name = variableName;
-                    }
-                    if (stateSave.ParentContainer != null)
-                    {
-                        isFile = temp.GetIsFileFromRoot(stateSave.ParentContainer);
-                    }
-                }
-
-
+                bool isFile = DetermineIfIsFile(stateSave, variableName, instanceSave, variableSave);
 
                 if (value != null && value is IList)
                 {
@@ -594,6 +562,43 @@ value is string asString &&
 
         }
 
+        private static bool DetermineIfIsFile(StateSave stateSave, string variableName, InstanceSave instanceSave, VariableSave variableSave)
+        {
+            bool isFile = false;
+
+            // Why might instanceSave be null?
+            // The reason is because StateSaves
+            // are used both for actual game data
+            // as well as temporary variable containers.
+            // If a StateSave is a temporary container then
+            // instanceSave may (probably will be) null.
+            if (instanceSave != null)
+            {
+                VariableSave temp = variableSave;
+                if (variableSave == null)
+                {
+                    temp = new VariableSave();
+                    temp.Name = variableName;
+                }
+                isFile = temp.GetIsFileFromRoot(instanceSave);
+            }
+            else
+            {
+                VariableSave temp = variableSave;
+                if (variableSave == null)
+                {
+                    temp = new VariableSave();
+                    temp.Name = variableName;
+                }
+                if (stateSave.ParentContainer != null)
+                {
+                    isFile = temp.GetIsFileFromRoot(stateSave.ParentContainer);
+                }
+            }
+
+            return isFile;
+        }
+
         private static bool TrySetReservedValues(StateSave stateSave, string variableName, object value, InstanceSave instanceSave)
         {
             bool isReservedName = false;

diff --git a/Gum/Plugins/InternalPlugins/VariableGrid/StateReferencingInstanceMember.cs b/Gum/Plugins/InternalPlugins/VariableGrid/StateReferencingInstanceMember.cs
@@ -1,4 +1,5 @@
 using CommonFormsAndControls;
+using ExCSS;
 using Gum.DataTypes;
 using Gum.DataTypes.ComponentModel;
 using Gum.DataTypes.Variables;
@@ -561,6 +562,15 @@ private object HandleCustomGet(object instance)
 
         private void HandleCustomSet(object gumElementOrInstanceSaveAsObject, SetPropertyArgs setPropertyArgs)
         {
+            ////////////////////Early Out/////////////////////////
+            if (!CanSetValue(gumElementOrInstanceSaveAsObject, setPropertyArgs))
+            {
+                setPropertyArgs.IsAssignmentCancelled = true;
+                return;
+            }
+            /////////////////End Early Out////////////////////////
+
+
             object newValue = setPropertyArgs.Value;
             if (mPropertyDescriptor != null)
             {
@@ -678,6 +688,21 @@ private void HandleCustomSet(object gumElementOrInstanceSaveAsObject, SetPropert
             // set the value
         }
 
+        private bool CanSetValue(object gumElementOrInstanceSaveAsObject, SetPropertyArgs setPropertyArgs)
+        {
+            if(this.RootVariableName == "Points")
+            {
+                var value = setPropertyArgs.Value as List<System.Numerics.Vector2>;
+
+                if(value?.Count < 4)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         private void HandleSetToDefault(string obj)
         {
             string variableName = Name;

diff --git a/WpfDataUi/DataTypes/InstanceMember.cs b/WpfDataUi/DataTypes/InstanceMember.cs
@@ -21,6 +21,7 @@ public class SetPropertyArgs
     {
         public SetPropertyCommitType CommitType { get; set; }
         public object Value { get; set; }
+        public bool IsAssignmentCancelled { get; set; }
     }
 
     public class InstanceMember : DependencyObject
@@ -137,8 +138,10 @@ public object Value
 
         }
 
-        public void SetValue(object value, SetPropertyCommitType commitType)
+        public ApplyValueResult SetValue(object value, SetPropertyCommitType commitType)
         {
+            ApplyValueResult result = ApplyValueResult.Success;
+
             if (CustomSetPropertyEvent != null)
             {
                 var args = new SetPropertyArgs
@@ -147,6 +150,11 @@ public void SetValue(object value, SetPropertyCommitType commitType)
                     Value = value
                 };
                 CustomSetPropertyEvent(Instance, args);
+
+                if(args.IsAssignmentCancelled)
+                {
+                    result = ApplyValueResult.UnknownError;
+                }
             }
             else if (CustomSetEvent != null)
             {
@@ -157,6 +165,7 @@ public void SetValue(object value, SetPropertyCommitType commitType)
                 LateBinder.GetInstance(Instance.GetType()).SetValue(Instance, Name, value);
             }
             OnPropertyChanged("Value");
+            return result;
         }
 
         public bool IsDefined 

diff --git a/WpfDataUi/IDataUiExtensionMethods.cs b/WpfDataUi/IDataUiExtensionMethods.cs
@@ -47,9 +47,11 @@ public static ApplyValueResult TrySetValueOnInstance(this IDataUi dataUi)
                     if(dataUi.InstanceMember.Value != valueOnUi)
                     {
                         //dataUi.InstanceMember.Value = valueOnUi;
-                        dataUi.InstanceMember.SetValue(valueOnUi, SetPropertyCommitType.Full);
-                        result = ApplyValueResult.Success;
-                        dataUi.InstanceMember.CallAfterSetByUi();
+                        result = dataUi.InstanceMember.SetValue(valueOnUi, SetPropertyCommitType.Full);
+                        if(result == ApplyValueResult.Success)
+                        {
+                            dataUi.InstanceMember.CallAfterSetByUi();
+                        }
                     }
                     else
                     {