[NUI] Fix NUI button not working when style disabled

There was a flag that prevent state updating while applying style.
But the flag seemed to have a bug : when style is disabled, the state updating is never going to be done.

This patch fixes the bug and changes the flag's name to be more contextual: styleApplied -> styleApplying.

Signed-off-by: Jiyun Yang <ji.yang@samsung.com>

diff --git a/src/Tizen.NUI.Components/Controls/Button.Internal.cs b/src/Tizen.NUI.Components/Controls/Button.Internal.cs
index 9db2270..b4815a2 100644 (file)
--- a/src/Tizen.NUI.Components/Controls/Button.Internal.cs
+++ b/src/Tizen.NUI.Components/Controls/Button.Internal.cs
@@ -34,7 +34,7 @@ namespace Tizen.NUI.Components
         private EventHandler<StateChangedEventArgs> stateChangeHandler;
 
         private bool isPressed = false;
-        private bool styleApplied = false;
+        private bool styleApplying = false;
 
         /// <summary>
         /// Gets accessibility name.
@@ -193,7 +193,7 @@ namespace Tizen.NUI.Components
         [EditorBrowsable(EditorBrowsableState.Never)]
         protected void UpdateState()
         {
-            if (!styleApplied) return;
+            if (styleApplying) return;
 
             ControlState sourceState = ControlState;
             ControlState targetState;

diff --git a/src/Tizen.NUI.Components/Controls/Button.cs b/src/Tizen.NUI.Components/Controls/Button.cs
index 86bcef2..cc4bd78 100755 (executable)
--- a/src/Tizen.NUI.Components/Controls/Button.cs
+++ b/src/Tizen.NUI.Components/Controls/Button.cs
@@ -1005,7 +1005,7 @@ namespace Tizen.NUI.Components
         {
             Debug.Assert(buttonIcon != null && buttonText != null);
 
-            styleApplied = false;
+            styleApplying = true;
 
             base.ApplyStyle(viewStyle);
 
@@ -1041,7 +1041,7 @@ namespace Tizen.NUI.Components
                 }
             }
 
-            styleApplied = true;
+            styleApplying = false;
             UpdateState();
         }