From: dongsug.song Date: Thu, 2 Jun 2022 08:46:41 +0000 (+0900) Subject: [NUI] Apply SetFocusFinderRootView() to DialogPage only when DefaultAlgorithm Enabled X-Git-Tag: accepted/tizen/unified/20231205.024657~921 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18f5bd922e51e682fdc56aa20a88b95f2f9253ec;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Apply SetFocusFinderRootView() to DialogPage only when DefaultAlgorithm Enabled --- 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); + } } }