From cf6e4eace0824b8eee65400b43520511f0afe7b3 Mon Sep 17 00:00:00 2001 From: zhouleonlei <56956725+zhouleonlei@users.noreply.github.com> Date: Thu, 7 Jan 2021 17:39:49 +0800 Subject: [PATCH] [NUI] Fix CA2000 issues for Render Shadow (#2493) * [NUI] Fix CA2000 issues for Render Shadow * [NUI] Fix CA2000 for Render --- src/Tizen.NUI/src/public/Renderer.cs | 192 +++++++++++++++------ .../src/public/ViewProperty/ImageShadow.cs | 8 +- src/Tizen.NUI/src/public/ViewProperty/Shadow.cs | 8 +- .../src/public/ViewProperty/ShadowBase.cs | 18 +- 4 files changed, 170 insertions(+), 56 deletions(-) diff --git a/src/Tizen.NUI/src/public/Renderer.cs b/src/Tizen.NUI/src/public/Renderer.cs index 3b95424..8c5446d 100755 --- a/src/Tizen.NUI/src/public/Renderer.cs +++ b/src/Tizen.NUI/src/public/Renderer.cs @@ -47,12 +47,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthIndex).Get(out temp); + Tizen.NUI.PropertyValue pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthIndex); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthIndex, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthIndex, temp); + temp.Dispose(); } } @@ -65,12 +69,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.FaceCullingMode).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.FaceCullingMode); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.FaceCullingMode, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.FaceCullingMode, temp); + temp.Dispose(); } } @@ -83,12 +91,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendMode).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendMode); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendMode, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendMode, temp); + temp.Dispose(); } } @@ -101,12 +113,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationRgb, temp); + temp.Dispose(); } } @@ -119,12 +135,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendEquationAlpha, temp); + temp.Dispose(); } } @@ -137,12 +157,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcRgb, temp); + temp.Dispose(); } } @@ -155,12 +179,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestRgb, temp); + temp.Dispose(); } } @@ -173,12 +201,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorSrcAlpha, temp); + temp.Dispose(); } } @@ -191,12 +223,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendFactorDestAlpha, temp); + temp.Dispose(); } } @@ -209,12 +245,16 @@ namespace Tizen.NUI get { Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendColor).Get(temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendColor); + pValue.Get(temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendColor, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendColor, temp); + temp.Dispose(); } } @@ -227,12 +267,16 @@ namespace Tizen.NUI get { bool temp = false; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.BlendPreMultipliedAlpha, temp); + temp.Dispose(); } } @@ -245,12 +289,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeFirst, temp); + temp.Dispose(); } } @@ -263,12 +311,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeCount).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.IndexRangeCount); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeCount, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.IndexRangeCount, temp); + temp.Dispose(); } } @@ -281,12 +333,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthWriteMode).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthWriteMode); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthWriteMode, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthWriteMode, temp); + temp.Dispose(); } } @@ -299,12 +355,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthFunction).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthFunction); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthFunction, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthFunction, temp); + temp.Dispose(); } } @@ -317,12 +377,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthTestMode).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.DepthTestMode); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthTestMode, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.DepthTestMode, temp); + temp.Dispose(); } } @@ -335,12 +399,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.RenderMode).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.RenderMode); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.RenderMode, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.RenderMode, temp); + temp.Dispose(); } } @@ -353,12 +421,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunction).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunction); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunction, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunction, temp); + temp.Dispose(); } } @@ -371,12 +443,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionMask, temp); + temp.Dispose(); } } @@ -389,12 +465,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilFunctionReference, temp); + temp.Dispose(); } } @@ -407,12 +487,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilMask).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilMask); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilMask, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilMask, temp); + temp.Dispose(); } } @@ -425,12 +509,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnFail, temp); + temp.Dispose(); } } @@ -443,12 +531,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZFail, temp); + temp.Dispose(); } } @@ -461,12 +553,16 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass).Get(out temp); + var pValue = Tizen.NUI.Object.GetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass); + pValue.Get(out temp); + pValue.Dispose(); return temp; } set { - Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass, new Tizen.NUI.PropertyValue(value)); + var temp = new Tizen.NUI.PropertyValue(value); + Tizen.NUI.Object.SetProperty(SwigCPtr, Renderer.Property.StencilOperationOnZPass, temp); + temp.Dispose(); } } diff --git a/src/Tizen.NUI/src/public/ViewProperty/ImageShadow.cs b/src/Tizen.NUI/src/public/ViewProperty/ImageShadow.cs index c031862..4168c58 100755 --- a/src/Tizen.NUI/src/public/ViewProperty/ImageShadow.cs +++ b/src/Tizen.NUI/src/public/ViewProperty/ImageShadow.cs @@ -83,10 +83,14 @@ namespace Tizen.NUI internal ImageShadow(PropertyMap propertyMap) : base(propertyMap) { Border = noBorder; - propertyMap.Find(ImageVisualProperty.Border)?.Get(Border); + PropertyValue pValue = propertyMap.Find(ImageVisualProperty.Border); + pValue?.Get(Border); + pValue?.Dispose(); string url = null; - propertyMap.Find(ImageVisualProperty.URL)?.Get(out url); + pValue = propertyMap.Find(ImageVisualProperty.URL); + pValue?.Get(out url); + pValue?.Dispose(); Url = url; } diff --git a/src/Tizen.NUI/src/public/ViewProperty/Shadow.cs b/src/Tizen.NUI/src/public/ViewProperty/Shadow.cs index be4c30e..0ef8581 100755 --- a/src/Tizen.NUI/src/public/ViewProperty/Shadow.cs +++ b/src/Tizen.NUI/src/public/ViewProperty/Shadow.cs @@ -65,10 +65,14 @@ namespace Tizen.NUI internal Shadow(PropertyMap propertyMap) : base(propertyMap) { Color = noColor; - propertyMap.Find(ColorVisualProperty.MixColor)?.Get(Color); + PropertyValue pValue = propertyMap.Find(ColorVisualProperty.MixColor); + pValue?.Get(Color); + pValue?.Dispose(); float blurRadius = 0; - propertyMap.Find(ColorVisualProperty.BlurRadius)?.Get(out blurRadius); + pValue = propertyMap.Find(ColorVisualProperty.BlurRadius); + pValue?.Get(out blurRadius); + pValue?.Dispose(); BlurRadius = blurRadius; } diff --git a/src/Tizen.NUI/src/public/ViewProperty/ShadowBase.cs b/src/Tizen.NUI/src/public/ViewProperty/ShadowBase.cs index 2af8dae..80b85fb 100755 --- a/src/Tizen.NUI/src/public/ViewProperty/ShadowBase.cs +++ b/src/Tizen.NUI/src/public/ViewProperty/ShadowBase.cs @@ -74,6 +74,8 @@ namespace Tizen.NUI { SetTransformMap(transformMap); } + transformProperty.Dispose(); + transformMap.Dispose(); } /// @@ -187,8 +189,10 @@ namespace Tizen.NUI if (!noOffset.Equals(Offset)) { - transformMap[(int)VisualTransformPropertyType.OffsetPolicy] = new PropertyValue(new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute)); + var temp = new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute); + transformMap[(int)VisualTransformPropertyType.OffsetPolicy] = new PropertyValue(temp); transformMap[(int)VisualTransformPropertyType.Offset] = PropertyValue.CreateWithGuard(Offset); + temp.Dispose(); } if (!noExtents.Equals(Extents)) @@ -199,7 +203,9 @@ namespace Tizen.NUI transformMap[(int)VisualTransformPropertyType.Origin] = new PropertyValue((int)Visual.AlignType.Center); transformMap[(int)VisualTransformPropertyType.AnchorPoint] = new PropertyValue((int)Visual.AlignType.Center); - return new PropertyValue(transformMap); + var ret = new PropertyValue(transformMap); + transformMap.Dispose(); + return ret; } private void SetTransformMap(PropertyMap transformMap) @@ -209,8 +215,12 @@ namespace Tizen.NUI return; } - transformMap.Find((int)VisualTransformPropertyType.Offset)?.Get(Offset); - transformMap.Find((int)VisualTransformPropertyType.ExtraSize)?.Get(Extents); + PropertyValue temp = transformMap.Find((int)VisualTransformPropertyType.Offset); + temp?.Get(Offset); + temp?.Dispose(); + temp = transformMap.Find((int)VisualTransformPropertyType.ExtraSize); + temp?.Get(Extents); + temp?.Dispose(); } } } -- 2.7.4