fixed sprite texture address modein state not affecting values shown …

…in property grid
vchelaru · Dec 29, 2023 · 2da0ef9 · 2da0ef9
1 parent 2017ad0
commit 2da0ef9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/Gum/DataTypes/RecursiveVariableFinder.cs b/Gum/DataTypes/RecursiveVariableFinder.cs
@@ -62,7 +62,7 @@ public RecursiveVariableFinder(InstanceSave instanceSave, ElementSave container)
             // Vic asks - if the RFV is for an instance in a container, should the instance name be set on the
             // elementWithState? The GetVariable method seems to expect that, so let's try that:
             // Update - the reason this works this way is - if the ElementWithState has an instance, then the name
-            // of the instance is automatically used on the variable. In other words, if this is assigned, and we want
+            // of the instance is automatically used on the variable. In other words, if an instance is assigned, and we want
             // the X value on the instance, then we sould ask the RecursiveVariableFinder for "X".
             // If no instance is assigned, then we would ask for "InstanceName.X". However, since the
             // constructor here explicitly assigns an instance, I think it's proper to assign the instance
@@ -88,12 +88,16 @@ public RecursiveVariableFinder(InstanceSave instanceSave, List<ElementWithState>
 
         public RecursiveVariableFinder(List<ElementWithState> elementStack)
         {
-            ContainerType = VariableContainerType.StateSave;
 
 
             var last = elementStack.Last();
             mStateSave = last.StateSave;
             ElementStack = elementStack;
+
+            // technically the elementstack could include elements that have instances. However, 
+            // the element stack could have a mix where some ElementWithStates have instances, and 
+            // some do not. therefore, we can't assume the entire thing uses instances. 
+            ContainerType = VariableContainerType.StateSave;
         }
 
         public RecursiveVariableFinder(StateSave stateSave)

diff --git a/Gum/Logic/VariableSaveLogic.cs b/Gum/Logic/VariableSaveLogic.cs
@@ -3,6 +3,8 @@
 using Gum.Managers;
 using Gum.Plugins;
 using Gum.ToolStates;
+using Gum.Wireframe;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Gum.Logic
@@ -66,7 +68,14 @@ public static bool GetIfVariableIsActive(VariableSave defaultVariable, ElementSa
                 RecursiveVariableFinder rvf;
                 if (currentInstance != null)
                 {
-                    rvf = new RecursiveVariableFinder(currentInstance, container);
+                    //rvf = new RecursiveVariableFinder(currentInstance, container);
+                    // this should respect the current state:
+
+                    var elementWithState = new ElementWithState(container);
+                    elementWithState.InstanceName = currentInstance?.Name;
+                    elementWithState.StateName = GumState.Self.SelectedState.SelectedStateSave?.Name;
+                    var stack = new List<ElementWithState>() { elementWithState };
+                    rvf = new RecursiveVariableFinder(stack);
                 }
                 else
                 {

diff --git a/Gum/PropertyGridHelpers/Excluders/SpritePropertyGridVariableExcluder.cs b/Gum/PropertyGridHelpers/Excluders/SpritePropertyGridVariableExcluder.cs
@@ -1,6 +1,7 @@
 using Gum.Managers;
 using Gum.Plugins.BaseClasses;
 using System.ComponentModel.Composition;
+using System.Linq;
 
 namespace Gum.PropertyGridHelpers.Excluders
 {
@@ -33,6 +34,12 @@ private bool HandleVariableExcluded(DataTypes.Variables.VariableSave variable, D
             {
                 prefix = nameOfInstanceOwningVariable + ".";
             }
+
+            if(string.IsNullOrEmpty(prefix) && !string.IsNullOrEmpty( rvf.ElementStack.Last().InstanceName ))
+            {
+                prefix = rvf.ElementStack.Last().InstanceName + ".";
+
+            }
 
             if (rootName == "Texture Top" || rootName == "Texture Left")
             {