From 79f3ed78c9103d1818d8d572702efabfe978e96f Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Mon, 18 Dec 2017 13:25:26 +0900 Subject: [PATCH] [NUI] Revert "temporary fix! fix wrong value of screen position in object dump" Conflicts: src/Tizen.NUI/src/public/Layer.cs This reverts commit 9bd231dcee34a49087688f8af0bc0d269562ecfa. Change-Id: I466c7a4a929afe6a89a8fbe8d46fc54e46a0a70e --- src/Tizen.NUI/src/public/BaseComponents/View.cs | 4 ---- src/Tizen.NUI/src/public/Layer.cs | 8 -------- src/Tizen.NUI/src/public/NUIApplication.cs | 7 ------- 3 files changed, 19 deletions(-) mode change 100755 => 100644 src/Tizen.NUI/src/public/BaseComponents/View.cs diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs old mode 100755 new mode 100644 index 1311cbd..aa4e4cd --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -2151,10 +2151,6 @@ namespace Tizen.NUI.BaseComponents { Vector2 temp = new Vector2(0.0f, 0.0f); GetProperty(View.Property.SCREEN_POSITION).Get(temp); - // Dali's default layer is default center origin. need to change as top left. - // NUI's Layer is like a transparent film which covers entire window. (Layer is not an actor of Dali) - // otherwise, this makes ScreenPosition as wrong value. - temp -= (Window.Instance.GetSize() * 0.5f); return temp; } } diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index bfa0b8e..f4be7f4 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -162,7 +162,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); if(Window.Instance != null) { - this.SetParentOrigin(Tizen.NUI.ParentOrigin.TopLeft); this.SetAnchorPoint(Tizen.NUI.PivotPoint.TopLeft); this.SetResizePolicy(ResizePolicyType.FillToParent, DimensionType.AllDimensions); } @@ -180,13 +179,6 @@ namespace Tizen.NUI throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetParentOrigin(Vector3 origin) - { - NDalicPINVOKE.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin)); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - /// /// Downcasts a handle to layer handle. /// diff --git a/src/Tizen.NUI/src/public/NUIApplication.cs b/src/Tizen.NUI/src/public/NUIApplication.cs index 6dc58ea..cb2c50d 100755 --- a/src/Tizen.NUI/src/public/NUIApplication.cs +++ b/src/Tizen.NUI/src/public/NUIApplication.cs @@ -169,13 +169,6 @@ namespace Tizen.NUI protected override void OnCreate() { base.OnCreate(); - - // Dali's default layer is default center origin. need to change as top left. - // NUI's Layer is like a transparent film which covers entire window. (Layer is not an actor of Dali) - // otherwise, this makes ScreenPosition as wrong value. - Layer defaultLayer = Window.GetDefaultLayer(); - defaultLayer.SetParentOrigin(Tizen.NUI.ParentOrigin.TopLeft); - defaultLayer.SetAnchorPoint(Tizen.NUI.PivotPoint.TopLeft); } /// -- 2.7.4