From 0031e19c93de80e4e7cfdaca145ae0a6ce15fe44 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Fri, 10 Mar 2017 11:38:56 +0900 Subject: [PATCH] back out for NUI-30, NUI-29 - remove "\r" in the file Change-Id: I9e2a4df0bea7743c095dbe6b8abde0b621d31848 Signed-off-by: dongsug.song --- Tizen.NUI/src/public/Actor.cs | 69 ++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/Tizen.NUI/src/public/Actor.cs b/Tizen.NUI/src/public/Actor.cs index 04ae4f1..cfb294f 100755 --- 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 // // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// // This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts // Some have been manually changed - + namespace Tizen.NUI -{ - - using System; +{ + + using System; using System.Runtime.InteropServices; public class Actor : Handle @@ -982,12 +982,19 @@ namespace Tizen.NUI SetProperty(Actor.Property.ANCHOR_POINT, new Tizen.NUI.PropertyValue(value)); } } - + public Size CurrentSize + { + get + { + return GetCurrentSize(); + } + } public Size Size { get { - Size temp = GetCurrentSize(); + Size temp = new Size(0.0f, 0.0f, 0.0f); + GetProperty(Actor.Property.SIZE).Get(temp); return temp; } set @@ -999,8 +1006,9 @@ namespace Tizen.NUI { get { - Size temp = GetCurrentSize(); - return temp.Width; + float temp = 0.0f; + GetProperty(Actor.Property.SIZE_WIDTH).Get(ref temp); + return temp; } set { @@ -1011,8 +1019,9 @@ namespace Tizen.NUI { get { - Size temp = GetCurrentSize(); - return temp.Height; + float temp = 0.0f; + GetProperty(Actor.Property.SIZE_HEIGHT).Get(ref temp); + return temp; } set { @@ -1023,7 +1032,9 @@ namespace Tizen.NUI { get { - Size temp = GetCurrentSize(); + float temp = 0.0f; + GetProperty(Actor.Property.SIZE_DEPTH).Get(ref temp); + return temp; return temp.Depth; } set @@ -1031,11 +1042,19 @@ namespace Tizen.NUI SetProperty(Actor.Property.SIZE_DEPTH, new Tizen.NUI.PropertyValue(value)); } } + public Position CurrentPosition + { + get + { + return GetCurrentPosition(); + } + } public Position Position { get { - Position temp = GetCurrentPosition(); + Position temp = new Position(0.0f, 0.0f, 0.0f); + GetProperty(Actor.Property.POSITION).Get(temp); return temp; } set @@ -1047,8 +1066,9 @@ namespace Tizen.NUI { get { - Position temp = GetCurrentPosition(); - return temp.X; + float temp = 0.0f; + GetProperty(Actor.Property.POSITION_X).Get(ref temp); + return temp; } set { @@ -1059,8 +1079,9 @@ namespace Tizen.NUI { get { - Position temp = GetCurrentPosition(); - return temp.Y; + float temp = 0.0f; + GetProperty(Actor.Property.POSITION_Y).Get(ref temp); + return temp; } set { @@ -1071,8 +1092,9 @@ namespace Tizen.NUI { get { - Position temp = GetCurrentPosition(); - return temp.Z; + float temp = 0.0f; + GetProperty(Actor.Property.POSITION_Z).Get(ref temp); + return temp; } set { @@ -1646,6 +1668,7 @@ namespace Tizen.NUI { Disabled, ClipChildren - } - -} + } + +} + -- 2.7.4