Fix for TCT 80/120680/1
authorminho.sun <minho.sun@samsung.com>
Thu, 23 Mar 2017 17:07:12 +0000 (02:07 +0900)
committerminho.sun <minho.sun@samsung.com>
Thu, 23 Mar 2017 17:07:12 +0000 (02:07 +0900)
Fix for TCT

Change-Id: I1e8b6c17ed857cc5e1f8293e9d77042777016b15
Signed-off-by: minho.sun <minho.sun@samsung.com>
Tizen.NUI/src/public/CustomView/VisualView.cs
Tizen.NUI/src/public/View.cs

index 843738b..e685890 100755 (executable)
@@ -117,7 +117,7 @@ namespace Tizen.NUI
         /// <param name="visualName"> The name of visual to remove. </param>
         public void RemoveVisual(string visualName)
         {
-            foreach (var item in _visualDictionary)
+            foreach (var item in _visualDictionary.ToList())
             {
                 if (item.Value.Name == visualName)
                 {
index 7934aeb..ae2db50 100755 (executable)
@@ -557,7 +557,7 @@ namespace Tizen.NUI
                 if (_offStageEventHandler == null)
                 {
                     _offStageEventCallback = OffStage;
-                    this.OnStageSignal().Connect(_offStageEventCallback);
+                    this.OffStageSignal().Connect(_offStageEventCallback);
                 }
 
                 _offStageEventHandler += value;
@@ -569,7 +569,7 @@ namespace Tizen.NUI
 
                 if (_offStageEventHandler == null && _offStageEventCallback != null)
                 {
-                    this.OnStageSignal().Disconnect(_offStageEventCallback);
+                    this.OffStageSignal().Disconnect(_offStageEventCallback);
                 }
             }
         }
@@ -968,9 +968,27 @@ namespace Tizen.NUI
         {
             get
             {
-                string temp;
-                GetProperty(View.Property.STATE).Get(out temp);
-                return temp;
+                int temp = 0;\r
+                GetProperty(View.Property.STATE).Get(ref temp);\r
+                switch (temp)\r
+                {\r
+                    case 0:\r
+                    {\r
+                        return "NORMAL";\r
+                    }\r
+                    case 1:\r
+                    {\r
+                        return "FOCUSED";\r
+                    }\r
+                    case 2:\r
+                    {\r
+                        return "DISABLED";\r
+                    }\r
+                    default:\r
+                    {\r
+                        return "";\r
+                    }\r
+                }\r
             }
             set
             {