back out for NUI-30, NUI-29

[platform/core/csapi/nui.git] / Tizen.NUI / src / public / Actor.cs

diff --git a/Tizen.NUI/src/public/Actor.cs b/Tizen.NUI/src/public/Actor.cs
index 04ae4f1..cfb294f 100755 (executable)
--- a/Tizen.NUI/src/public/Actor.cs
+++ b/Tizen.NUI/src/public/Actor.cs
@@ -18,21 +18,21 @@
 // You may obtain a copy of the License at\r
 //\r
 // http://www.apache.org/licenses/LICENSE-2.0\r
-//
+//\r
 // Unless required by applicable law or agreed to in writing, software\r
 // distributed under the License is distributed on an "AS IS" BASIS,\r
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
-//
+//\r
 \r
 // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts\r
 // Some have been manually changed\r
-
+\r
 namespace Tizen.NUI\r
-{
-
-    using System;
+{\r
+\r
+    using System;\r
     using System.Runtime.InteropServices;\r
 \r
     public class Actor : Handle\r
@@ -982,12 +982,19 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
-\r
+        public Size CurrentSize\r
+        {\r
+            get\r
+            {\r
+                return GetCurrentSize();\r
+            }\r
+        } \r
         public Size Size\r
         {\r
             get\r
             {\r
-                Size temp = GetCurrentSize();\r
+                           Size temp = new Size(0.0f, 0.0f, 0.0f);\r
+                GetProperty(Actor.Property.SIZE).Get(temp);\r
                 return temp;\r
             }\r
             set\r
@@ -999,8 +1006,9 @@ namespace Tizen.NUI
         {\r
             get\r
             {\r
-                Size temp = GetCurrentSize();\r
-                return temp.Width;\r
+                float temp = 0.0f;\r
+                GetProperty(Actor.Property.SIZE_WIDTH).Get(ref temp);\r
+                return temp;\r
             }\r
             set\r
             {\r
@@ -1011,8 +1019,9 @@ namespace Tizen.NUI
         {\r
             get\r
             {\r
-                Size temp = GetCurrentSize();\r
-                return temp.Height;\r
+                float temp = 0.0f;\r
+                GetProperty(Actor.Property.SIZE_HEIGHT).Get(ref temp);\r
+                return temp;\r
             }\r
             set\r
             {\r
@@ -1023,7 +1032,9 @@ namespace Tizen.NUI
         {\r
             get\r
             {\r
-                Size temp = GetCurrentSize();\r
+                float temp = 0.0f;\r
+                GetProperty(Actor.Property.SIZE_DEPTH).Get(ref temp);\r
+                return temp;\r
                 return temp.Depth;\r
             }\r
             set\r
@@ -1031,11 +1042,19 @@ namespace Tizen.NUI
                 SetProperty(Actor.Property.SIZE_DEPTH, new Tizen.NUI.PropertyValue(value));\r
             }\r
         }\r
+        public Position CurrentPosition\r
+        {\r
+            get\r
+            {\r
+                return GetCurrentPosition();\r
+            }\r
+        }\r
         public Position Position\r
         {\r
             get\r
             {\r
-                Position temp = GetCurrentPosition();\r
+                           Position temp = new Position(0.0f, 0.0f, 0.0f);\r
+                GetProperty(Actor.Property.POSITION).Get(temp);\r
                 return temp;\r
             }\r
             set\r
@@ -1047,8 +1066,9 @@ namespace Tizen.NUI
         {\r
             get\r
             {\r
-                Position temp = GetCurrentPosition();\r
-                return temp.X;\r
+                float temp = 0.0f;\r
+                GetProperty(Actor.Property.POSITION_X).Get(ref temp);\r
+                return temp;\r
             }\r
             set\r
             {\r
@@ -1059,8 +1079,9 @@ namespace Tizen.NUI
         {\r
             get\r
             {\r
-                Position temp = GetCurrentPosition();\r
-                return temp.Y;\r
+                float temp = 0.0f;\r
+                GetProperty(Actor.Property.POSITION_Y).Get(ref temp);\r
+                return temp;\r
             }\r
             set\r
             {\r
@@ -1071,8 +1092,9 @@ namespace Tizen.NUI
         {\r
             get\r
             {\r
-                Position temp = GetCurrentPosition();\r
-                return temp.Z;\r
+                float temp = 0.0f;\r
+                GetProperty(Actor.Property.POSITION_Z).Get(ref temp);\r
+                return temp;\r
             }\r
             set\r
             {\r
@@ -1646,6 +1668,7 @@ namespace Tizen.NUI
     {\r
         Disabled,\r
         ClipChildren\r
-    }
-
-}
+    }\r
+\r
+}\r
+\r