diff --git a/src/Tizen.NUI/src/internal/Utility/ItemViewBindableProperty.cs b/src/Tizen.NUI/src/internal/Utility/ItemViewBindableProperty.cs
index e847f9d7648..9694f73fdd7 100755
--- a/src/Tizen.NUI/src/internal/Utility/ItemViewBindableProperty.cs
+++ b/src/Tizen.NUI/src/internal/Utility/ItemViewBindableProperty.cs
@@ -26,8 +26,8 @@ public partial class ItemView
/// LayoutProperty
///
[EditorBrowsable(EditorBrowsableState.Never)]
- public static BindableProperty LayoutProperty = null;
- internal static void SetInternalLayoutProperty(BindableObject bindable, object oldValue, object newValue)
+ public static new BindableProperty LayoutProperty = null;
+ internal static new void SetInternalLayoutProperty(BindableObject bindable, object oldValue, object newValue)
{
var instance = (Tizen.NUI.ItemView)bindable;
if (newValue != null)
@@ -35,7 +35,7 @@ internal static void SetInternalLayoutProperty(BindableObject bindable, object o
instance.InternalLayout = (Tizen.NUI.PropertyArray)newValue;
}
}
- internal static object GetInternalLayoutProperty(BindableObject bindable)
+ internal static new object GetInternalLayoutProperty(BindableObject bindable)
{
var instance = (Tizen.NUI.ItemView)bindable;
return instance.InternalLayout;
diff --git a/src/Tizen.NUI/src/public/BaseComponents/AnimatedVectorImageViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/AnimatedVectorImageViewBindableProperty.cs
index 4782618684c..7a13e053b96 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/AnimatedVectorImageViewBindableProperty.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/AnimatedVectorImageViewBindableProperty.cs
@@ -45,18 +45,22 @@ internal static object GetInternalResourceURLProperty(BindableObject bindable)
///
/// ResourceUrlProperty
///
+ ///
+ /// This property does not have same logic with LottieAnimationView.ResourceUrl.
+ /// Should use new keyword!
+ ///
[EditorBrowsable(EditorBrowsableState.Never)]
#if REMOVE_READONLY_FOR_BINDABLE_PROPERTY
public static new BindableProperty ResourceUrlProperty = null;
#else
public static readonly new BindableProperty ResourceUrlProperty = null;
#endif
- internal static void SetInternalResourceUrlProperty(BindableObject bindable, object oldValue, object newValue)
+ internal static new void SetInternalResourceUrlProperty(BindableObject bindable, object oldValue, object newValue)
{
var instance = (Tizen.NUI.BaseComponents.AnimatedVectorImageView)bindable;
instance.InternalResourceUrl = (string)newValue;
}
- internal static object GetInternalResourceUrlProperty(BindableObject bindable)
+ internal static new object GetInternalResourceUrlProperty(BindableObject bindable)
{
var instance = (Tizen.NUI.BaseComponents.AnimatedVectorImageView)bindable;
return instance.InternalResourceUrl;
@@ -88,13 +92,17 @@ internal static object GetInternalRepeatCountProperty(BindableObject bindable)
///
/// CurrentFrameProperty
///
+ ///
+ /// This property does not have same logic with LottieAnimationView.CurrentFrame.
+ /// Should use new keyword!
+ ///
[EditorBrowsable(EditorBrowsableState.Never)]
#if REMOVE_READONLY_FOR_BINDABLE_PROPERTY
public static new BindableProperty CurrentFrameProperty = null;
#else
public static readonly new BindableProperty CurrentFrameProperty = null;
#endif
- internal static void SetInternalCurrentFrameProperty(BindableObject bindable, object oldValue, object newValue)
+ internal static new void SetInternalCurrentFrameProperty(BindableObject bindable, object oldValue, object newValue)
{
var instance = (Tizen.NUI.BaseComponents.AnimatedVectorImageView)bindable;
if (newValue != null)
@@ -102,7 +110,7 @@ internal static void SetInternalCurrentFrameProperty(BindableObject bindable, ob
instance.InternalCurrentFrame = (int)newValue;
}
}
- internal static object GetInternalCurrentFrameProperty(BindableObject bindable)
+ internal static new object GetInternalCurrentFrameProperty(BindableObject bindable)
{
var instance = (Tizen.NUI.BaseComponents.AnimatedVectorImageView)bindable;
return instance.InternalCurrentFrame;
diff --git a/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/CanvasView.cs b/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/CanvasView.cs
index 9537eeaacaf..43a0f5a0e3a 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/CanvasView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/VectorGraphics/CanvasView.cs
@@ -93,9 +93,9 @@ static CanvasView()
{
ViewBoxProperty = BindableProperty.Create(nameof(ViewBox), typeof(Tizen.NUI.Size2D), typeof(Tizen.NUI.BaseComponents.VectorGraphics.CanvasView), null,
propertyChanged: SetInternalViewBoxProperty, defaultValueCreator: GetInternalViewBoxProperty);
- SynchronousLoadingProperty = BindableProperty.Create(nameof(ViewBox), typeof(bool), typeof(Tizen.NUI.BaseComponents.VectorGraphics.CanvasView), true,
+ SynchronousLoadingProperty = BindableProperty.Create(nameof(SynchronousLoading), typeof(bool), typeof(Tizen.NUI.BaseComponents.VectorGraphics.CanvasView), true,
propertyChanged: SetInternalSynchronousLoadingProperty, defaultValueCreator: GetInternalSynchronousLoadingProperty);
- RasterizationRequestManuallyProperty = BindableProperty.Create(nameof(ViewBox), typeof(bool), typeof(Tizen.NUI.BaseComponents.VectorGraphics.CanvasView), false,
+ RasterizationRequestManuallyProperty = BindableProperty.Create(nameof(RasterizationRequestManually), typeof(bool), typeof(Tizen.NUI.BaseComponents.VectorGraphics.CanvasView), false,
propertyChanged: SetInternalRasterizationRequestManuallyProperty, defaultValueCreator: GetInternalRasterizationRequestManuallyProperty);
}
}
diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs
index aa6f91a5f14..68ccf9d4953 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibilityEvent.cs
@@ -210,14 +210,29 @@ public override bool IsInvalid
protected override bool ReleaseHandle()
{
- DisposeQueue.Instance.Add(this);
+ if (!IsInvalid)
+ {
+ DisposeQueue.Instance.Add(this);
+ }
return true;
}
- public void Dispose()
+ protected override void Dispose(bool disposing)
{
- Interop.View.DeleteControlHandleView(handle);
- this.SetHandle(IntPtr.Zero);
+ if (IsInvalid)
+ {
+ return;
+ }
+
+ if (disposing)
+ {
+ Interop.View.DeleteControlHandleView(handle);
+ this.SetHandle(IntPtr.Zero);
+ }
+ else
+ {
+ DisposeQueue.Instance.Add(this);
+ }
}
}
diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
index ea3b60554fe..34e7735bf3a 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
@@ -51,7 +51,8 @@ internal enum BackgroundExtraDataUpdatedFlag : byte
internal BackgroundExtraDataUpdatedFlag backgroundExtraDataUpdatedFlag = BackgroundExtraDataUpdatedFlag.None;
- private bool backgroundExtraDataUpdateProcessAttachedFlag = false;
+ // TODO : Re-open this API when we resolve Animation issue.
+ // private bool backgroundExtraDataUpdateProcessAttachedFlag = false;
internal virtual LayoutItem CreateDefaultLayout()
{
@@ -1217,7 +1218,8 @@ internal virtual void UpdateBackgroundExtraData(BackgroundExtraDataUpdatedFlag f
private void UpdateBackgroundExtraData(object source, EventArgs e)
{
// Note : To allow event attachment during UpdateBackgroundExtraData, let we make flag as false before call UpdateBackgroundExtraData().
- backgroundExtraDataUpdateProcessAttachedFlag = false;
+ // TODO : Re-open this API when we resolve Animation issue.
+ // backgroundExtraDataUpdateProcessAttachedFlag = false;
UpdateBackgroundExtraData();
}
diff --git a/src/Tizen.NUI/src/public/Common/WeakEvent.cs b/src/Tizen.NUI/src/public/Common/WeakEvent.cs
index 78bd573c340..1a24c9c8cdf 100755
--- a/src/Tizen.NUI/src/public/Common/WeakEvent.cs
+++ b/src/Tizen.NUI/src/public/Common/WeakEvent.cs
@@ -96,7 +96,7 @@ protected virtual void OnCountIncreased()
///
///
/// The event handler count decreases when an event handler is removed
- /// with or after detecting that it is no longer valid.
+ /// with or after detecting that it is no longer valid.
///
/// 12
protected virtual void OnCountDecreased()
diff --git a/src/Tizen.NUI/src/public/Utility/AccumulatingVelocityTrackerStrategy.cs b/src/Tizen.NUI/src/public/Utility/AccumulatingVelocityTrackerStrategy.cs
index c79132c900f..453889a6d05 100644
--- a/src/Tizen.NUI/src/public/Utility/AccumulatingVelocityTrackerStrategy.cs
+++ b/src/Tizen.NUI/src/public/Utility/AccumulatingVelocityTrackerStrategy.cs
@@ -28,7 +28,7 @@ namespace Tizen.NUI.Utility
{
///
/// Accumulating Velocity Tracker
- ///
+ ///
[EditorBrowsable(EditorBrowsableState.Never)]
public class AccumulatingVelocityTrackerStrategy : VelocityTrackerStrategy
{
@@ -56,7 +56,7 @@ public Movement(uint pEventTime, float pPosition)
///
/// Create an instance of AccumulatingVelocityTrackerStrategy.
- ///
+ ///
[EditorBrowsable(EditorBrowsableState.Never)]
public AccumulatingVelocityTrackerStrategy(uint maximumTime) : base()
{
diff --git a/src/Tizen.NUI/src/public/Utility/VelocityTracker.cs b/src/Tizen.NUI/src/public/Utility/VelocityTracker.cs
index 962d1438e1b..9e8092503fa 100644
--- a/src/Tizen.NUI/src/public/Utility/VelocityTracker.cs
+++ b/src/Tizen.NUI/src/public/Utility/VelocityTracker.cs
@@ -28,6 +28,7 @@ namespace Tizen.NUI.Utility
{
///
/// Calculates the velocity of touch movements over time.
+ ///
///
/// private void OnPanGestureDetected(object source, PanGestureDetector.DetectedEventArgs e)
/// {
@@ -45,7 +46,6 @@ namespace Tizen.NUI.Utility
/// }
/// }
///
- ///
[EditorBrowsable(EditorBrowsableState.Never)]
public class VelocityTracker
{
diff --git a/src/Tizen.NUI/src/public/Utility/VelocityTrackerStrategy.cs b/src/Tizen.NUI/src/public/Utility/VelocityTrackerStrategy.cs
index 800d1a0fbae..7055b2a0416 100644
--- a/src/Tizen.NUI/src/public/Utility/VelocityTrackerStrategy.cs
+++ b/src/Tizen.NUI/src/public/Utility/VelocityTrackerStrategy.cs
@@ -23,7 +23,7 @@ namespace Tizen.NUI.Utility
///
/// VelocityTrackerStrategy
- ///
+ ///
[EditorBrowsable(EditorBrowsableState.Never)]
public abstract class VelocityTrackerStrategy
{
diff --git a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CanvasViewSample.cs b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CanvasViewSample.cs
index 5970c5091c1..3f2bd925541 100644
--- a/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CanvasViewSample.cs
+++ b/test/Tizen.NUI.Samples/Tizen.NUI.Samples/Samples/CanvasViewSample.cs
@@ -35,6 +35,10 @@ public void Activate()
PivotPoint = PivotPoint.Center,
PositionUsesPivotPoint = true,
};
+ root.PropertyChanged += (object o, global::System.ComponentModel.PropertyChangedEventArgs e) =>
+ {
+ Tizen.Log.Error("NUI", $"root view Property Changed! {e.PropertyName}\n");
+ };
window.Add(root);
window.KeyEvent += WindowKeyEvent;
@@ -46,6 +50,10 @@ public void Activate()
PivotPoint = PivotPoint.Center,
PositionUsesPivotPoint = true,
};
+ canvasView.PropertyChanged += (object o, global::System.ComponentModel.PropertyChangedEventArgs e) =>
+ {
+ Tizen.Log.Error("NUI", $"canvas view Property Changed! {e.PropertyName}\n");
+ };
RadialGradient roundedRectFillRadialGradient = new RadialGradient()
{