From 115d6fa9fcdaf43c853ad2c1f304496d0dd5eb0f Mon Sep 17 00:00:00 2001
From: huiyueun <35286162+huiyueun@users.noreply.github.com>
Date: Tue, 18 Jun 2019 09:53:34 +0900
Subject: [PATCH] Revert "[NUI] Fix ConvertIdToView (#877)" (#889)

This reverts commit cd93540791a0740bc85259e10f33b0959b94d5dc.
---
 .../src/public/BaseComponents/View.cs         | 19 +++++++++++++------
 src/Tizen.NUI/src/public/Container.cs         |  5 -----
 src/Tizen.NUI/src/public/Layer.cs             |  5 -----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index beaeb3a80..4a8e25911 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -4568,11 +4568,6 @@ 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));
@@ -5557,7 +5552,19 @@ namespace Tizen.NUI.BaseComponents
 
         private View ConvertIdToView(uint id)
         {
-            return GetParent()?.FindCurrentChildById(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;
         }
 
         private void OnBackgroundResourceLoaded(IntPtr view)
diff --git a/src/Tizen.NUI/src/public/Container.cs b/src/Tizen.NUI/src/public/Container.cs
index 44f38c42a..8a61ac8ae 100755
--- a/src/Tizen.NUI/src/public/Container.cs
+++ b/src/Tizen.NUI/src/public/Container.cs
@@ -135,10 +135,5 @@ 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 447c89b71..06a743842 100755
--- a/src/Tizen.NUI/src/public/Layer.cs
+++ b/src/Tizen.NUI/src/public/Layer.cs
@@ -367,11 +367,6 @@ 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)
-- 
2.34.1