Use widget window instead of NUI default window

Change-Id: Ib20670d2a95e6de681d6595600e0415d3006f333

diff --git a/Settings/SettingInputmethod/SettingDefaultKeyboard.cs b/Settings/SettingInputmethod/SettingDefaultKeyboard.cs
index a1bc74e66bc88af91c27e30edb06975d4f4d6cef..1114ba9cb1fa8c45923f73576f5ad1a262ca1b18 100644 (file)
--- a/Settings/SettingInputmethod/SettingDefaultKeyboard.cs
+++ b/Settings/SettingInputmethod/SettingDefaultKeyboard.cs
@@ -17,9 +17,9 @@ namespace SettingInputmethod
         private int currentIndex = -1;\r
         private int pickerIndex = 0;\r
 \r
-        public SettingDefaultKeyboard() : base()\r
+        public SettingDefaultKeyboard(Window parentWindow) : base()\r
         {\r
-            Window window = NUIApplication.GetDefaultWindow();\r
+            Window window = parentWindow;\r
             Navigator navigator = window.GetDefaultNavigator();\r
             Size2D windowSize = window.Size;\r
 \r

diff --git a/Settings/SettingInputmethod/SettingWidgetInputmethod.cs b/Settings/SettingInputmethod/SettingWidgetInputmethod.cs
index 8123d43d9770e7792c4b36cc8c57044966db3d68..e3b84a28d7b468910a055ff6bced4efbe94617d2 100644 (file)
--- a/Settings/SettingInputmethod/SettingWidgetInputmethod.cs
+++ b/Settings/SettingInputmethod/SettingWidgetInputmethod.cs
@@ -12,6 +12,7 @@ namespace SettingInputmethod
 {\r
     class SettingWidgetInputmethod : Widget\r
     {\r
+        static Window mWindow;\r
         static Navigator navigator;\r
         static SettingDefaultKeyboard settingDefaultKeyboard;\r
         static SettingItem defaultKeyboard;\r
@@ -23,6 +24,7 @@ namespace SettingInputmethod
             Bundle bundle = Bundle.Decode(contentInfo);\r
             navigator = window.GetDefaultNavigator();\r
             window.BackgroundColor = Color.Transparent;\r
+            mWindow = window;\r
 \r
             ScrollableBase settingScroll = new ScrollableBase()\r
             {\r
@@ -134,7 +136,7 @@ namespace SettingInputmethod
             switch (e.Name)\r
             {\r
                 case "DefaultKeyboard":\r
-                    settingDefaultKeyboard = new SettingDefaultKeyboard();\r
+                    settingDefaultKeyboard = new SettingDefaultKeyboard(mWindow);\r
                     navigator.Push(settingDefaultKeyboard);\r
                     navigator.Popped += PoppedEvent;\r
                     break;\r

diff --git a/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk b/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk
index cc1b8141eed450d8f9dc77980055f1cb83ebd142..6ef69defa8b2fc5d97d752cf825cf8e84c0167ea 100644 (file)
Binary files a/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk and b/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk differ