projects
/
platform
/
core
/
csapi
/
tizenfx.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bfc5797
)
[NUI] fix bug in item's content set (#3191)
author
SangHyeon Jade Lee
<sh10233.lee@samsung.com>
Mon, 14 Jun 2021 11:18:43 +0000
(20:18 +0900)
committer
dongsug-song
<35130733+dongsug-song@users.noreply.github.com>
Wed, 23 Jun 2021 08:25:09 +0000
(17:25 +0900)
src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs
patch
|
blob
|
history
src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs
patch
|
blob
|
history
src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultTitleItem.cs
patch
|
blob
|
history
diff --git
a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs
b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs
index
f449be9
..
cd19b3d
100755
(executable)
--- 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
{
}
internal set
{
+ if (itemImage != null) Remove(itemImage);
itemImage = value;
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;
}
}
layoutChanged = true;
}
}
@@
-132,14
+140,12
@@
namespace Tizen.NUI.Components
}
set
{
}
set
{
- if (value == null)
- {
- Remove(itemBadge);
- }
+ if (itemBadge != null) Remove(itemBadge);
itemBadge = value;
if (itemBadge != null)
{
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;
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
(executable)
--- 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
{
}
set
{
+ if (itemIcon != null) Remove(itemIcon);
itemIcon = value;
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;
{
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
(executable)
--- 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
{
}
set
{
+ if (itemIcon != null) Remove(itemIcon);
itemIcon = value;
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;
}
}
}
}