From 98779ac0d21fd315b9335de047072611cbac1c23 Mon Sep 17 00:00:00 2001 From: zhouleonlei Date: Wed, 18 Nov 2020 11:27:23 +0800 Subject: [PATCH] [NUI] Rollback the changes of Visual --- src/Tizen.NUI/src/public/Visuals/PrimitiveVisual.cs | 5 ++++- src/Tizen.NUI/src/public/Visuals/VisualAnimator.cs | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Tizen.NUI/src/public/Visuals/PrimitiveVisual.cs b/src/Tizen.NUI/src/public/Visuals/PrimitiveVisual.cs index 959545d..d153f93 100755 --- a/src/Tizen.NUI/src/public/Visuals/PrimitiveVisual.cs +++ b/src/Tizen.NUI/src/public/Visuals/PrimitiveVisual.cs @@ -325,7 +325,10 @@ namespace Tizen.NUI if (_bevelPercentage != null) { _outputVisualMap.Add(PrimitiveVisualProperty.BevelPercentage, new PropertyValue((float)_bevelPercentage)); } if (_bevelSmoothness != null) { _outputVisualMap.Add(PrimitiveVisualProperty.BevelSmoothness, new PropertyValue((float)_bevelSmoothness)); } if (_lightPosition != null) { _outputVisualMap.Add(PrimitiveVisualProperty.LightPosition, new PropertyValue(_lightPosition)); } - base.ComposingPropertyMap(); + if (_shader != null) { _outputVisualMap.Add(Visual.Property.Shader, new PropertyValue(_shader)); } + if (_premultipliedAlpha != null) { _outputVisualMap.Add(Visual.Property.PremultipliedAlpha, new PropertyValue((bool)_premultipliedAlpha)); } + if (_opacity != null) { _outputVisualMap.Add(Visual.Property.Opacity, new PropertyValue((float)_opacity)); } + if (_visualFittingMode != null) { _outputVisualMap.Add(Visual.Property.VisualFittingMode, new PropertyValue((int)_visualFittingMode)); } } } } diff --git a/src/Tizen.NUI/src/public/Visuals/VisualAnimator.cs b/src/Tizen.NUI/src/public/Visuals/VisualAnimator.cs index 99e7834..851f4e0 100755 --- a/src/Tizen.NUI/src/public/Visuals/VisualAnimator.cs +++ b/src/Tizen.NUI/src/public/Visuals/VisualAnimator.cs @@ -163,7 +163,6 @@ namespace Tizen.NUI _transition.Add("animator", new PropertyValue(_animator)); _outputVisualMap = _transition; - base.ComposingPropertyMap(); } } //temporary fix for TCT -- 2.7.4