From: huiyueun <35286162+huiyueun@users.noreply.github.com>
Date: Wed, 5 Jun 2019 06:13:24 +0000 (+0900)
Subject: [NUI] Fix ConvertIdToView (#877)
X-Git-Tag: 5.5_M2~185
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd93540791a0740bc85259e10f33b0959b94d5dc;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] Fix ConvertIdToView (#877)

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
---

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 4a8e259..beaeb3a 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -4568,6 +4568,11 @@ namespace Tizen.NUI.BaseComponents
             return ret;
         }
 
+        internal override View FindCurrentChildById(uint id)
+        {
+            return FindChildById(id);
+        }
+
         internal void SetParentOrigin(Vector3 origin)
         {
             Interop.ActorInternal.Actor_SetParentOrigin(swigCPtr, Vector3.getCPtr(origin));
@@ -5552,19 +5557,7 @@ namespace Tizen.NUI.BaseComponents
 
         private View ConvertIdToView(uint id)
         {
-            View view = null;
-            if (GetParent() is View)
-            {
-                View parentView = GetParent() as View;
-                view = parentView.FindChildById(id);
-            }
-
-            if (!view)
-            {
-                view = Window.Instance.GetRootLayer().FindChildById(id);
-            }
-
-            return view;
+            return GetParent()?.FindCurrentChildById(id);
         }
 
         private void OnBackgroundResourceLoaded(IntPtr view)
diff --git a/src/Tizen.NUI/src/public/Container.cs b/src/Tizen.NUI/src/public/Container.cs
index 8a61ac8..44f38c4 100755
--- a/src/Tizen.NUI/src/public/Container.cs
+++ b/src/Tizen.NUI/src/public/Container.cs
@@ -135,5 +135,10 @@ namespace Tizen.NUI
             base.Dispose(type);
         }
 
+        internal virtual View FindCurrentChildById(uint id)
+        {
+            return null;
+        }
+
     }
 } // namespace Tizen.NUI
diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs
index 06a7438..447c89b 100755
--- a/src/Tizen.NUI/src/public/Layer.cs
+++ b/src/Tizen.NUI/src/public/Layer.cs
@@ -367,6 +367,11 @@ namespace Tizen.NUI
             return ret;
         }
 
+        internal override View FindCurrentChildById(uint id)
+        {
+            return FindChildById(id);
+        }
+
         /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public View FindChildByName(string viewName)