diff options
| author | minho.sun <minho.sun@samsung.com> | 2017-08-14 20:18:05 +0900 |
|---|---|---|
| committer | dongsug.song <dongsug.song@samsung.com> | 2017-08-22 09:39:23 +0900 |
| commit | af68385c370bb2b530da0550ac488e6a5d104a16 (patch) | |
| tree | c80d1fd91df4169c757eadcc910cfdd9c27248bd | |
| parent | 0d3978fea60673cebc383cb47658101457a43328 (diff) | |
| download | nui-af68385c370bb2b530da0550ac488e6a5d104a16.tar.gz nui-af68385c370bb2b530da0550ac488e6a5d104a16.tar.bz2 nui-af68385c370bb2b530da0550ac488e6a5d104a16.zip | |
Fix Window Set/Get Size/Position
Change-Id: I87bec91a5ba2a1bcf20cb66c567f432a2a8d1d3d
| -rwxr-xr-x | Tizen.NUI/src/public/Window.cs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Tizen.NUI/src/public/Window.cs b/Tizen.NUI/src/public/Window.cs index 53a1dca..17b6872 100755 --- a/Tizen.NUI/src/public/Window.cs +++ b/Tizen.NUI/src/public/Window.cs @@ -1272,7 +1272,9 @@ namespace Tizen.NUI internal void SetWindowSize(Size2D size) { - NDalicManualPINVOKE.SetSize(swigCPtr, Size2D.getCPtr(size)); + var val = new Uint16Pair((uint)size.Width, (uint)size.Height); + NDalicManualPINVOKE.SetSize(swigCPtr, Uint16Pair.getCPtr(val)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1280,7 +1282,6 @@ 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; @@ -1288,13 +1289,17 @@ namespace Tizen.NUI internal void SetPosition(Position2D position) { - NDalicManualPINVOKE.SetPosition(swigCPtr, Position2D.getCPtr(position)); + var val = new Uint16Pair( (uint)position.X, (uint)position.Y ); + NDalicManualPINVOKE.SetPosition(swigCPtr, Uint16Pair.getCPtr(val)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } internal Position2D GetPosition() { - Position2D ret = new Position2D(NDalicManualPINVOKE.GetPosition(swigCPtr), true); + var val = new Uint16Pair(NDalicManualPINVOKE.GetPosition(swigCPtr), true); + Position2D ret = new Position2D(val.GetX(), val.GetY()); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } |