From d522413202665ff5d7cde9299ec9e9832879550f Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Mon, 12 Jun 2017 12:02:08 +0100 Subject: [PATCH] Visual DepthIndex changed from Float to Integer Change-Id: I1fbd95cf6b5d8d29cc5190827eeb012449e7b3be --- .../NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs | 4 ++-- Tizen.NUI/src/internal/NDalicPINVOKE.cs | 4 ++-- Tizen.NUI/src/public/VisualBase.cs | 8 ++++---- Tizen.NUI/src/public/VisualMaps.cs | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs index f58ed61..aa8a9e6 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs @@ -72,7 +72,7 @@ namespace VisualViewTest3 /* image visual 1. No transform setting case. */ imageVisualMap1 = new ImageVisual(); imageVisualMap1.URL = resources + "/images/image-1.jpg"; - imageVisualMap1.DepthIndex = 1.0f; + imageVisualMap1.DepthIndex = 1; //_visualView.AddVisual("imageVisual1", imageVisualMap1); /* image visual 2. Using RelativePosition and SizePolicyWidth setting case. */ @@ -86,7 +86,7 @@ namespace VisualViewTest3 imageVisualMap2.Origin = Visual.AlignType.TopBegin; imageVisualMap2.AnchorPoint = Visual.AlignType.TopBegin; /* Ensure imageVisual show */ - imageVisualMap2.DepthIndex = 9.0f; + imageVisualMap2.DepthIndex = 9; _visualView.AddVisual("imageVisual2", imageVisualMap2); /* If imageVisual2 added first, the it will be covered by imageVisual1. so, we need to set their depth index to ensure they all can be showed. diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs index 6a175b3..e3377d7 100755 --- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -10042,10 +10042,10 @@ class NDalicPINVOKE { public static extern void VisualBase_GetNaturalSize(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VisualBase_SetDepthIndex")] - public static extern void VisualBase_SetDepthIndex(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2); + public static extern void VisualBase_SetDepthIndex(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VisualBase_GetDepthIndex")] - public static extern float VisualBase_GetDepthIndex(global::System.Runtime.InteropServices.HandleRef jarg1); + public static extern int VisualBase_GetDepthIndex(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_VisualBase_CreatePropertyMap")] public static extern void VisualBase_CreatePropertyMap(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/Tizen.NUI/src/public/VisualBase.cs b/Tizen.NUI/src/public/VisualBase.cs index 35d9694..6307e8b 100755 --- a/Tizen.NUI/src/public/VisualBase.cs +++ b/Tizen.NUI/src/public/VisualBase.cs @@ -152,7 +152,7 @@ namespace Tizen.NUI /// /// the depth index of this visual. /// - public float DepthIndex + public int DepthIndex { set { @@ -163,15 +163,15 @@ namespace Tizen.NUI return GetDepthIndex(); } } - internal void SetDepthIndex(float index) + internal void SetDepthIndex(int index) { NDalicPINVOKE.VisualBase_SetDepthIndex(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal float GetDepthIndex() + internal int GetDepthIndex() { - float ret = NDalicPINVOKE.VisualBase_GetDepthIndex(swigCPtr); + int ret = NDalicPINVOKE.VisualBase_GetDepthIndex(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/Tizen.NUI/src/public/VisualMaps.cs b/Tizen.NUI/src/public/VisualMaps.cs index 2991aef..978611b 100755 --- a/Tizen.NUI/src/public/VisualMaps.cs +++ b/Tizen.NUI/src/public/VisualMaps.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI private PropertyMap _visualTransformMap = null; - private float? _depthIndex = null; + private int? _depthIndex = null; protected PropertyMap _outputVisualMap = null; internal string Name @@ -408,11 +408,11 @@ namespace Tizen.NUI /// By default, the depth index is 0.
/// Optional. /// - public float DepthIndex + public int DepthIndex { get { - return _depthIndex ?? (0.0f); + return _depthIndex ?? (0); } set { -- 2.7.4