From 7dc67b89bc23dbdd1270613a26da21a87226ee0c Mon Sep 17 00:00:00 2001
From: SangHyeon Jade Lee <sh10233.lee@samsung.com>
Date: Mon, 14 Jun 2021 20:18:43 +0900
Subject: [PATCH] [NUI] fix bug in item's content set (#3191)

---
 .../Controls/RecyclerView/Item/DefaultGridItem.cs       | 16 +++++++++++-----
 .../Controls/RecyclerView/Item/DefaultLinearItem.cs     | 17 ++++++++++++++++-
 .../Controls/RecyclerView/Item/DefaultTitleItem.cs      |  9 +++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs
index f449be9..cd19b3d2 100755
--- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs
+++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs
@@ -113,7 +113,15 @@ namespace Tizen.NUI.Components
             }
             internal set
             {
+                if (itemImage != null) Remove(itemImage);
                 itemImage = value;
+                if (itemImage != null)
+                {
+                    //FIXME: User applied image's style can be overwritten!
+                    if (ItemStyle != null) itemImage.ApplyStyle(ItemStyle.Image);
+                    Add(itemImage);
+                    itemImage.Relayout += OnImageRelayout;
+                }
                 layoutChanged = true;
             }
         }
@@ -132,14 +140,12 @@ namespace Tizen.NUI.Components
             }
             set
             {
-                if (value == null)
-                {
-                    Remove(itemBadge);
-                }
+                if (itemBadge != null) Remove(itemBadge);
                 itemBadge = value;
                 if (itemBadge != null)
                 {
-                    itemBadge.ApplyStyle(ItemStyle.Badge);
+                    //FIXME: User applied badge's style can be overwritten!
+                    if (ItemStyle != null) itemBadge.ApplyStyle(ItemStyle.Badge);
                     Add(itemBadge);
                 }
                 layoutChanged = true;
diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs
index 81fb113..dd6a730 100755
--- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs
+++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs
@@ -86,7 +86,16 @@ namespace Tizen.NUI.Components
             }
             set
             {
+                if (itemIcon != null) Remove(itemIcon);
                 itemIcon = value;
+                if (itemIcon != null)
+                {
+                    //FIXME: User applied icon's style can be overwritten!
+                    if (ItemStyle != null) itemIcon.ApplyStyle(ItemStyle.Icon);
+                    Add(itemIcon);
+                    itemIcon.Relayout += OnIconRelayout;
+                }
+                layoutChanged = true;
             }
         }
 
@@ -221,7 +230,13 @@ namespace Tizen.NUI.Components
             {
                 if (itemExtra != null) Remove(itemExtra);
                 itemExtra = value;
-                Add(itemExtra);
+                if (itemExtra != null)
+                {
+                    //FIXME: User applied extra's style can be overwritten!
+                    if (ItemStyle != null) itemExtra.ApplyStyle(ItemStyle.Extra);
+                    Add(itemExtra);
+                }
+                layoutChanged = true;
             }
         }
 
diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs
index 769b893..56c0c94 100755
--- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs
+++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs
@@ -84,7 +84,16 @@ namespace Tizen.NUI.Components
             }
             set
             {
+                if (itemIcon != null) Remove(itemIcon);
                 itemIcon = value;
+                if (itemIcon != null)
+                {
+                    //FIXME: User applied icon's style can be overwritten!
+                    if (ItemStyle != null) itemIcon.ApplyStyle(ItemStyle.Icon);
+                    Add(itemIcon);
+                    itemIcon.Relayout += OnIconRelayout;
+                }
+                layoutChanged = true;
             }
         }
 
-- 
2.7.4