Fix crash issue due to NUI API change

[platform/core/uifw/ise-default-nui.git] / ISEDefaultNUI / ISEDefaultNUI.cs

diff --git a/ISEDefaultNUI/ISEDefaultNUI.cs b/ISEDefaultNUI/ISEDefaultNUI.cs
index f045c64..de4d801 100644 (file)
--- a/ISEDefaultNUI/ISEDefaultNUI.cs
+++ b/ISEDefaultNUI/ISEDefaultNUI.cs
@@ -18,7 +18,7 @@ namespace ISEDefaultNUI
         private static SCLNUI SclNui = null;
         private static SCLDBUS SclDbus = null;
 
-        public Program(string styleSheet, WindowMode windowMode, Size2D windowSize, Position2D windowPosition, WindowType type) : base(styleSheet, windowMode, windowSize, windowPosition, type)
+        public Program(string styleSheet, WindowMode windowMode, WindowType type) : base(styleSheet, windowMode, type)
         {
         }
 
@@ -634,12 +634,8 @@ namespace ISEDefaultNUI
             SclNui.GetInputModeSize(inputMode, (int)WindowAttribute.DisplayMode.Portrait, out portraitWidth, out portraitHeight);
             SclNui.GetInputModeSize(inputMode, (int)WindowAttribute.DisplayMode.Landscape, out landscapeWidth, out landscapeHeight);
 
-            Rectangle portraitRectangle = new Rectangle(0, 0, portraitWidth, portraitHeight);
-            Rectangle landscapeRectangle = new Rectangle(0, 0, landscapeWidth, landscapeHeight);
-            Window.Instance.SetPositionSizeWithOrientation(portraitRectangle, Window.WindowOrientation.Portrait);
-            Window.Instance.SetPositionSizeWithOrientation(landscapeRectangle, Window.WindowOrientation.Landscape);
-            Window.Instance.SetPositionSizeWithOrientation(portraitRectangle, Window.WindowOrientation.PortraitInverse);
-            Window.Instance.SetPositionSizeWithOrientation(landscapeRectangle, Window.WindowOrientation.LandscapeInverse);
+            IntPtr nativeHandle = new Window.SafeNativeWindowHandle().DangerousGetHandle();
+            InputMethodEditor.SetSize(nativeHandle, portraitWidth, portraitHeight, landscapeWidth, landscapeHeight);
         }
 
         private static void UpdateSpaceKey()
@@ -667,10 +663,7 @@ namespace ISEDefaultNUI
         {
             InputMethodEditor.Run(Create, Terminate, Show, Hide);
 
-            Size2D initSize = new Size2D(0, 0);
-            Position2D initPosition = new Position2D(0, 0);
-
-            var app = new Program("", WindowMode.Opaque, initSize, initPosition, WindowType.Ime);
+            var app = new Program("", WindowMode.Opaque, WindowType.Ime);
             app.Run(args);
         }
     }