From: InHong Han <inhong1.han@samsung.com>
Date: Fri, 14 Oct 2022 02:25:01 +0000 (+0900)
Subject: Use widget window instead of NUI default window
X-Git-Tag: accepted/tizen/unified/20221014.123804^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48dd5c38b8d0da6da954bb4414b9ff547d8f84c6;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-inputmethod.git

Use widget window instead of NUI default window

Change-Id: Ib20670d2a95e6de681d6595600e0415d3006f333
---

diff --git a/Settings/SettingInputmethod/SettingDefaultKeyboard.cs b/Settings/SettingInputmethod/SettingDefaultKeyboard.cs
index a1bc74e..1114ba9 100644
--- a/Settings/SettingInputmethod/SettingDefaultKeyboard.cs
+++ b/Settings/SettingInputmethod/SettingDefaultKeyboard.cs
@@ -17,9 +17,9 @@ namespace SettingInputmethod
         private int currentIndex = -1;
         private int pickerIndex = 0;
 
-        public SettingDefaultKeyboard() : base()
+        public SettingDefaultKeyboard(Window parentWindow) : base()
         {
-            Window window = NUIApplication.GetDefaultWindow();
+            Window window = parentWindow;
             Navigator navigator = window.GetDefaultNavigator();
             Size2D windowSize = window.Size;
 
diff --git a/Settings/SettingInputmethod/SettingWidgetInputmethod.cs b/Settings/SettingInputmethod/SettingWidgetInputmethod.cs
index 8123d43..e3b84a2 100644
--- a/Settings/SettingInputmethod/SettingWidgetInputmethod.cs
+++ b/Settings/SettingInputmethod/SettingWidgetInputmethod.cs
@@ -12,6 +12,7 @@ namespace SettingInputmethod
 {
     class SettingWidgetInputmethod : Widget
     {
+        static Window mWindow;
         static Navigator navigator;
         static SettingDefaultKeyboard settingDefaultKeyboard;
         static SettingItem defaultKeyboard;
@@ -23,6 +24,7 @@ namespace SettingInputmethod
             Bundle bundle = Bundle.Decode(contentInfo);
             navigator = window.GetDefaultNavigator();
             window.BackgroundColor = Color.Transparent;
+            mWindow = window;
 
             ScrollableBase settingScroll = new ScrollableBase()
             {
@@ -134,7 +136,7 @@ namespace SettingInputmethod
             switch (e.Name)
             {
                 case "DefaultKeyboard":
-                    settingDefaultKeyboard = new SettingDefaultKeyboard();
+                    settingDefaultKeyboard = new SettingDefaultKeyboard(mWindow);
                     navigator.Push(settingDefaultKeyboard);
                     navigator.Popped += PoppedEvent;
                     break;
diff --git a/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk b/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk
index cc1b814..6ef69de 100644
Binary files a/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk and b/packaging/org.tizen.cssetting-inputmethod-1.0.0.tpk differ