From 18f5bd922e51e682fdc56aa20a88b95f2f9253ec Mon Sep 17 00:00:00 2001
From: "dongsug.song" <dongsug.song@samsung.com>
Date: Thu, 2 Jun 2022 17:46:41 +0900
Subject: [PATCH] [NUI] Apply SetFocusFinderRootView() to DialogPage only when
 DefaultAlgorithm Enabled

---
 src/Tizen.NUI.Components/Controls/Navigation/Page.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Tizen.NUI.Components/Controls/Navigation/Page.cs b/src/Tizen.NUI.Components/Controls/Navigation/Page.cs
index ee15a92..0b56633 100755
--- a/src/Tizen.NUI.Components/Controls/Navigation/Page.cs
+++ b/src/Tizen.NUI.Components/Controls/Navigation/Page.cs
@@ -244,6 +244,11 @@ namespace Tizen.NUI.Components
         {
             if (FocusManager.Instance.IsDefaultAlgorithmEnabled())
             {
+                if (this is DialogPage)
+                {
+                    FocusManager.Instance.ResetFocusFinderRootView();
+                }
+
                 var currentFocusedView = FocusManager.Instance.GetCurrentFocusView();
                 if (currentFocusedView)
                 {
@@ -294,6 +299,11 @@ namespace Tizen.NUI.Components
                     temp.Unparent();
                     temp.Dispose();
                 }
+
+                if (this is DialogPage)
+                {
+                    FocusManager.Instance.SetFocusFinderRootView(this);
+                }
             }
 
         }
-- 
2.7.4