diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs
index 03c55015ee3..e25eb87ab01 100755
--- a/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs
+++ b/src/Tizen.NUI.Components/Controls/RecyclerView/CollectionView.cs
@@ -284,8 +284,28 @@ public enum ItemScrollTo
/// 9
public override IEnumerable ItemsSource
{
- get => GetValue(RecyclerView.ItemsSourceProperty) as IEnumerable;
- set => SetValue(RecyclerView.ItemsSourceProperty, value);
+ get
+ {
+ if (NUIApplication.IsUsingXaml)
+ {
+ return GetValue(RecyclerView.ItemsSourceProperty) as IEnumerable;
+ }
+ else
+ {
+ return GetInternalItemsSourceProperty(this) as IEnumerable;
+ }
+ }
+ set
+ {
+ if (NUIApplication.IsUsingXaml)
+ {
+ SetValue(RecyclerView.ItemsSourceProperty, value);
+ }
+ else
+ {
+ SetInternalItemsSourceProperty(this, null, value);
+ }
+ }
}
internal override IEnumerable InternalItemsSource
@@ -347,11 +367,25 @@ public override DataTemplate ItemTemplate
{
get
{
- return GetValue(ItemTemplateProperty) as DataTemplate;
+ if (NUIApplication.IsUsingXaml)
+ {
+ return GetValue(ItemTemplateProperty) as DataTemplate;
+ }
+ else
+ {
+ return GetInternalItemTemplateProperty(this) as DataTemplate;
+ }
}
set
{
- SetValue(ItemTemplateProperty, value);
+ if (NUIApplication.IsUsingXaml)
+ {
+ SetValue(ItemTemplateProperty, value);
+ }
+ else
+ {
+ SetInternalItemTemplateProperty(this, null, value);
+ }
NotifyPropertyChanged();
}
}
diff --git a/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs b/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs
index 5815897071c..2f40d4a602a 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/Style/ViewStyle.cs
@@ -853,7 +853,7 @@ public Extents Padding
}
else
{
- return (Extents)GetInternalPaddingProperty(this);
+ return (Extents)GetInternalPaddingProperty(this) ?? (padding = new Extents());
}
}
set
@@ -1001,7 +1001,7 @@ public Extents Margin
}
else
{
- return (Extents)GetInternalMarginProperty(this);
+ return (Extents)GetInternalMarginProperty(this) ?? (margin = new Extents());
}
}
set
diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
index 506023d01a7..da0cd4b3d26 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
@@ -95,21 +95,11 @@ internal static object GetInternalKeyInputFocusProperty(BindableObject bindable)
internal static void SetInternalBackgroundColorProperty(BindableObject bindable, object oldValue, object newValue)
{
var view = (View)bindable;
-
- if (NUIApplication.IsUsingXaml)
+ view.themeData?.selectorData?.ClearBackground(view);
+ if (newValue is Selector selector)
{
- view.themeData?.selectorData?.ClearBackground(view);
-
- if (newValue is Selector selector)
- {
- if (selector.HasAll()) view.SetBackgroundColor(selector.All);
- else view.EnsureSelectorData().BackgroundColor = new TriggerableSelector(view, selector, view.SetBackgroundColor, true);
- }
- else
- {
- view.SetBackgroundColor((Color)newValue);
- }
-
+ if (selector.HasAll()) view.SetBackgroundColor(selector.All);
+ else view.EnsureSelectorData().BackgroundColor = new TriggerableSelector(view, selector, view.SetBackgroundColor, true);
}
else
{