From 7f7b6519eb7f1fd36bc9bc1d8db1d381d0661852 Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Mon, 14 Aug 2017 16:41:28 +0900 Subject: [PATCH] Revert "[Tizen] Fix Window Set/Get Size/Position" This reverts commit d7ef9533ebaf6ae5067d1ee678a6675f5fa1036a. Change-Id: Ib35483ef18f6ac59850d4f8228153572a542ced8 --- src/Tizen.NUI/src/public/Window.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index 8c2b91f..8e0fdb0 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -1228,9 +1228,7 @@ namespace Tizen.NUI internal void SetWindowSize(Size2D size) { - var val = new Uint16Pair((uint)size.Width, (uint)size.Height); - NDalicManualPINVOKE.SetSize(swigCPtr, Uint16Pair.getCPtr(val)); - + NDalicManualPINVOKE.SetSize(swigCPtr, Size2D.getCPtr(size)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1238,6 +1236,7 @@ namespace Tizen.NUI { var val = new Uint16Pair(NDalicManualPINVOKE.GetSize(swigCPtr), false); Size2D ret = new Size2D(val.GetWidth(), val.GetHeight()); + val.Dispose(); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; @@ -1245,17 +1244,13 @@ namespace Tizen.NUI internal void SetPosition(Position2D position) { - var val = new Uint16Pair( (uint)position.X, (uint)position.Y ); - NDalicManualPINVOKE.SetPosition(swigCPtr, Uint16Pair.getCPtr(val)); - + NDalicManualPINVOKE.SetPosition(swigCPtr, Position2D.getCPtr(position)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } internal Position2D GetPosition() { - var val = new Uint16Pair(NDalicManualPINVOKE.GetPosition(swigCPtr), true); - Position2D ret = new Position2D(val.GetX(), val.GetY()); - + Position2D ret = new Position2D(NDalicManualPINVOKE.GetPosition(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } -- 2.7.4