Condition control is HUGE improved! #1022

rappen · Apr 4, 2024 · c712727 · c712727
1 parent 6dbdba8
commit c712727
Show file tree

Hide file tree

Showing 5 changed files with 391 additions and 140 deletions.
diff --git a/FetchXmlBuilder/Builder/TreeNodeExtensions.cs b/FetchXmlBuilder/Builder/TreeNodeExtensions.cs
@@ -154,5 +154,18 @@ internal static string GetTooltip(this TreeNode node)
 
             return tooltip;
         }
+
+        internal static bool HeritanceOfFilter(this TreeNode node)
+        {
+            if (node == null)
+            {
+                return false;
+            }
+            if (node.Name == "filter")
+            {
+                return true;
+            }
+            return HeritanceOfFilter(node.Parent);
+        }
     }
 }
diff --git a/FetchXmlBuilder/Controls/FetchXmlElementControlBase.cs b/FetchXmlBuilder/Controls/FetchXmlElementControlBase.cs
@@ -46,7 +46,7 @@ static FetchXmlElementControlBase()
         protected static Icon WarningIcon { get; }
         protected static Icon InfoIcon { get; }
 
-        public void InitializeFXB(Dictionary<string, string> collection, FetchXmlBuilder fetchXmlBuilder, TreeBuilderControl tree, TreeNode node)
+        protected void InitializeFXB(Dictionary<string, string> collection, FetchXmlBuilder fetchXmlBuilder, TreeBuilderControl tree, TreeNode node)
         {
             BeginInit();