[NUI] Fix exceptional All state case

Samsung · Jan 8, 2025 · 8e706d5 · 8e706d5
1 parent 26739b8
commit 8e706d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Tizen.NUI/src/internal/Common/ControlStateUtility.cs b/src/Tizen.NUI/src/internal/Common/ControlStateUtility.cs
@@ -55,6 +55,8 @@ public static ulong Register(string stateName)
             string trimmed = stateName.Trim();
             ulong bitMask = 0UL;
 
+            if (trimmed == "All") return FullMask;
+
             if (trimmed != "Normal" && !registeredStates.TryGetValue(trimmed, out bitMask))
             {
                 if (nextBitPosition + 1 > MaxBitWidth)

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs b/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs
@@ -115,6 +115,11 @@ private ControlState(string name) : this(ControlStateUtility.Register(name))
         /// <since_tizen> 9 </since_tizen>
         public static ControlState Create(string name)
         {
+            if (name == null)
+                throw new ArgumentNullException(nameof(name));
+            if (string.IsNullOrWhiteSpace(name))
+                throw new ArgumentException($"{nameof(name)} cannot be whitespace.", nameof(name));
+
             return new ControlState(name);
         }
 
@@ -176,6 +181,10 @@ public override string ToString()
             {
                 return nameof(Normal);
             }
+            else if (bitFlags == ControlStateUtility.FullMask)
+            {
+                return nameof(All);
+            }
 
             foreach (var (name, bitMask) in states)
             {