/*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali/public-api/rendering/visual-renderer.h>
//INTERNAL HEARDER
+#include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/internal/helpers/property-helper.h>
DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FILL)
DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, OVER_FIT_KEEP_ASPECT_RATIO)
DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, CENTER)
- DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_WIDTH)
DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_HEIGHT)
+ DALI_ENUM_TO_STRING_WITH_SCOPE(Visual::FittingMode, FIT_WIDTH)
DALI_ENUM_TO_STRING_TABLE_END(VISUAL_FITTING_MODE)
/**
}
}
+struct StringProperty
+{
+ const char* const name;
+ Property::Index index;
+};
+StringProperty PROPERTY_NAME_INDEX_TABLE[] =
+ {
+ {CUSTOM_SHADER, Toolkit::Visual::Property::SHADER},
+ {TRANSFORM, Toolkit::Visual::Property::TRANSFORM},
+ {PREMULTIPLIED_ALPHA, Toolkit::Visual::Property::PREMULTIPLIED_ALPHA},
+ {MIX_COLOR, Toolkit::Visual::Property::MIX_COLOR},
+ {OPACITY, Toolkit::Visual::Property::OPACITY},
+ {VISUAL_FITTING_MODE, Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE},
+ {BORDERLINE_WIDTH, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH},
+ {BORDERLINE_COLOR, Toolkit::DevelVisual::Property::BORDERLINE_COLOR},
+ {BORDERLINE_OFFSET, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET},
+ {CORNER_RADIUS, Toolkit::DevelVisual::Property::CORNER_RADIUS},
+ {CORNER_RADIUS_POLICY, Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY},
+};
+const uint16_t PROPERTY_NAME_INDEX_TABLE_COUNT = sizeof(PROPERTY_NAME_INDEX_TABLE) / sizeof(PROPERTY_NAME_INDEX_TABLE[0]);
+
+Property::Index GetVisualPropertyIndex(Property::Key key)
+{
+ if(key.type == Property::Key::STRING)
+ {
+ for(auto tableId = 0u; tableId < PROPERTY_NAME_INDEX_TABLE_COUNT; ++tableId)
+ {
+ if(key == PROPERTY_NAME_INDEX_TABLE[tableId].name)
+ {
+ return PROPERTY_NAME_INDEX_TABLE[tableId].index;
+ break;
+ }
+ }
+ }
+ return key.indexKey;
+}
+
} // namespace
Visual::Base::Base(VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type)
const Property::Key& key = pair.first;
const Property::Value& value = pair.second;
- Property::Key matchKey = key;
- if(matchKey.type == Property::Key::STRING)
- {
- if(matchKey == CUSTOM_SHADER)
- {
- matchKey = Property::Key(Toolkit::Visual::Property::SHADER);
- }
- else if(matchKey == TRANSFORM)
- {
- matchKey = Property::Key(Toolkit::Visual::Property::TRANSFORM);
- }
- else if(matchKey == PREMULTIPLIED_ALPHA)
- {
- matchKey = Property::Key(Toolkit::Visual::Property::PREMULTIPLIED_ALPHA);
- }
- else if(matchKey == MIX_COLOR)
- {
- matchKey = Property::Key(Toolkit::Visual::Property::MIX_COLOR);
- }
- else if(matchKey == OPACITY)
- {
- matchKey = Property::Key(Toolkit::Visual::Property::OPACITY);
- }
- else if(matchKey == VISUAL_FITTING_MODE)
- {
- matchKey = Property::Key(Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE);
- }
- else if(matchKey == BORDERLINE_WIDTH)
- {
- matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH);
- }
- else if(matchKey == BORDERLINE_COLOR)
- {
- matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_COLOR);
- }
- else if(matchKey == BORDERLINE_OFFSET)
- {
- matchKey = Property::Key(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET);
- }
- else if(matchKey == CORNER_RADIUS)
- {
- matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS);
- }
- else if(matchKey == CORNER_RADIUS_POLICY)
- {
- matchKey = Property::Key(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY);
- }
- }
-
- switch(matchKey.indexKey)
+ switch(GetVisualPropertyIndex(key))
{
case Toolkit::Visual::Property::SHADER:
{
case Toolkit::DevelVisual::Property::BORDERLINE_WIDTH:
{
float width;
- if(value.Get(width))
+ if(value.Get(width) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(width)))
{
- mImpl->mBorderlineWidth = width;
+ mImpl->SetBorderlineWidth(width);
}
- if(DALI_UNLIKELY(mImpl->mRenderer))
+ if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
{
// Unusual case. SetProperty called after OnInitialize().
// Assume that DoAction call UPDATE_PROPERTY.
DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
// Check whether we must update shader.
if(!mImpl->mAlwaysUsingBorderline && IsBorderlineRequired())
{
+ // Required to change shader mean, we didn't setup BORDERLINE_COLOR and BORDERLINE_OFFSET into mRenderer before. Set property now.
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
+
// Make Blend mode ON_WITHOUT_CULL for transparent mix color.
mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_MODE, BlendMode::ON_WITHOUT_CULL);
case Toolkit::DevelVisual::Property::BORDERLINE_COLOR:
{
Vector4 color;
- if(value.Get(color))
+ if(value.Get(color) && (mImpl->mDecorationData != nullptr || color != Vector4::ZERO))
{
- mImpl->mBorderlineColor = color;
+ mImpl->SetBorderlineColor(color);
}
- if(DALI_UNLIKELY(mImpl->mRenderer))
+ if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
{
// Unusual case. SetProperty called after OnInitialize().
// Assume that DoAction call UPDATE_PROPERTY.
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
}
break;
}
case Toolkit::DevelVisual::Property::BORDERLINE_OFFSET:
{
float offset;
- if(value.Get(offset))
+ if(value.Get(offset) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(offset)))
{
- mImpl->mBorderlineOffset = offset;
+ mImpl->SetBorderlineOffset(offset);
}
- if(DALI_UNLIKELY(mImpl->mRenderer))
+ if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForBorderline(mImpl->mType)))
{
// Unusual case. SetProperty called after OnInitialize().
// Assume that DoAction call UPDATE_PROPERTY.
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
}
break;
}
// Each values mean the radius of
// (top-left, top-right, bottom-right, bottom-left)
Vector4 radius;
- if(value.Get(radius))
+ if(value.Get(radius) && (mImpl->mDecorationData != nullptr || radius != Vector4::ZERO))
{
- mImpl->mCornerRadius = radius;
+ mImpl->SetCornerRadius(radius);
}
}
else
// If CORNER_RADIUS Property is float,
// Every corner radius have same value
float radius;
- if(value.Get(radius))
+ if(value.Get(radius) && (mImpl->mDecorationData != nullptr || !Dali::EqualsZero(radius)))
{
- mImpl->mCornerRadius = Vector4(radius, radius, radius, radius);
+ mImpl->SetCornerRadius(Vector4(radius, radius, radius, radius));
}
}
- if(DALI_UNLIKELY(mImpl->mRenderer))
+ if(DALI_UNLIKELY(mImpl->mRenderer && IsTypeAvailableForCornerRadius(mImpl->mType)))
{
// Unusual case. SetProperty called after OnInitialize().
// Assume that DoAction call UPDATE_PROPERTY.
DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->mCornerRadius);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
// Check whether we must update shader.
if(!mImpl->mAlwaysUsingCornerRadius && IsRoundedCornerRequired())
{
+ // Required to change shader mean, we didn't setup CORNER_RADIUS_POLICY into mRenderer before. Set property now.
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
+
// Change the shader must not be occured many times. we always have to use corner radius feature.
mImpl->mAlwaysUsingCornerRadius = true;
case Toolkit::Visual::Transform::Policy::RELATIVE:
case Toolkit::Visual::Transform::Policy::ABSOLUTE:
{
- mImpl->mCornerRadiusPolicy = policy;
+ mImpl->SetCornerRadiusPolicy(policy);
if(DALI_UNLIKELY(mImpl->mRenderer))
{
// Unusual case. SetProperty called after OnInitialize().
// Assume that DoAction call UPDATE_PROPERTY.
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
}
break;
}
float aspectCorrectedHeight = 0.f;
Vector2 naturalSize;
GetNaturalSize(naturalSize);
- if(naturalSize.width)
+ if(naturalSize.width > 0.0f)
{
aspectCorrectedHeight = naturalSize.height * width / naturalSize.width;
}
}
}
+void Visual::Base::DoActionExtension(const Dali::Property::Index actionId, const Dali::Any attributes)
+{
+ OnDoActionExtension(actionId, attributes);
+}
+
void Visual::Base::SetDepthIndex(int index)
{
mImpl->mDepthIndex = index;
mImpl->mTransform.mOffset = mImpl->mRenderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_OFFSET);
mImpl->mTransform.mSize = mImpl->mRenderer.GetProperty<Vector2>(VisualRenderer::Property::TRANSFORM_SIZE);
- if(IsTypeAvailableForCornerRadius(mImpl->mType))
+ if(IsRoundedCornerRequired())
{
- mImpl->mCornerRadius = mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS);
+ mImpl->SetCornerRadius(mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::CORNER_RADIUS));
}
- if(IsTypeAvailableForBorderline(mImpl->mType))
+ if(IsBorderlineRequired())
{
- mImpl->mBorderlineWidth = mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
- mImpl->mBorderlineColor = mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR);
- mImpl->mBorderlineOffset = mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET);
+ mImpl->SetBorderlineWidth(mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH));
+ mImpl->SetBorderlineColor(mImpl->mRenderer.GetProperty<Vector4>(DecoratedVisualRenderer::Property::BORDERLINE_COLOR));
+ mImpl->SetBorderlineOffset(mImpl->mRenderer.GetProperty<float>(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET));
}
}
if(IsTypeAvailableForBorderline(mImpl->mType))
{
- map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth);
- map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor);
- map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset);
+ map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+ map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+ map.Insert(Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
}
if(IsTypeAvailableForCornerRadius(mImpl->mType))
{
- map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->mCornerRadius);
- map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, static_cast<int>(mImpl->mCornerRadiusPolicy));
+ map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+ map.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, mImpl->GetCornerRadiusPolicy());
}
}
{
// Update values from Renderer
Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS);
- value.Get(mImpl->mCornerRadius);
+
+ Vector4 retValue = Vector4::ZERO;
+ if(value.Get(retValue))
+ {
+ if(mImpl->mDecorationData != nullptr || retValue != Vector4::ZERO)
+ {
+ mImpl->SetCornerRadius(retValue);
+ }
+ }
}
- return mImpl->mAlwaysUsingCornerRadius || !(mImpl->mCornerRadius == Vector4::ZERO);
+ return mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO);
}
return false;
}
{
// Update values from Renderer
Property::Value value = mImpl->mRenderer.GetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH);
- value.Get(mImpl->mBorderlineWidth);
+
+ float retValue = 0.0f;
+ if(value.Get(retValue))
+ {
+ if(mImpl->mDecorationData != nullptr || !Dali::EqualsZero(retValue))
+ {
+ mImpl->SetBorderlineWidth(retValue);
+ }
+ }
}
- return mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->mBorderlineWidth);
+ return mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth());
}
return false;
}
// May be overriden by derived class
}
+void Visual::Base::OnDoActionExtension(const Property::Index actionId, const Dali::Any attributes)
+{
+ // May be overriden by derived class
+}
+
void Visual::Base::RegisterMixColor()
{
if(mImpl->mRenderer)
{
if(IsTypeAvailableForCornerRadius(mImpl->mType))
{
- if(mImpl->mAlwaysUsingCornerRadius || !(mImpl->mCornerRadius == Vector4::ZERO))
+ if(mImpl->mAlwaysUsingCornerRadius || !(mImpl->GetCornerRadius() == Vector4::ZERO))
{
DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->mCornerRadius);
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
}
}
if(IsTypeAvailableForBorderline(mImpl->mType))
{
- if(mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->mBorderlineWidth))
+ if(mImpl->mAlwaysUsingBorderline || !EqualsZero(mImpl->GetBorderlineWidth()))
{
DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth);
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor);
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
}
}
}
{
// Update each values to renderer
DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterCornerRadiusUniform();
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->mCornerRadius);
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS, mImpl->GetCornerRadius());
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::CORNER_RADIUS_POLICY, static_cast<float>(mImpl->GetCornerRadiusPolicy()));
// Change shader
UpdateShader();
{
// Update each values to renderer
DownCast<DecoratedVisualRenderer>(mImpl->mRenderer).RegisterBorderlineUniform();
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->mBorderlineWidth);
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->mBorderlineColor);
- mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->mBorderlineOffset);
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_WIDTH, mImpl->GetBorderlineWidth());
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_COLOR, mImpl->GetBorderlineColor());
+ mImpl->mRenderer.SetProperty(DecoratedVisualRenderer::Property::BORDERLINE_OFFSET, mImpl->GetBorderlineOffset());
// Change shader
UpdateShader();
}
break;
}
- // Special case for MIX_COLOR
default:
{
+ // Special case for MIX_COLOR
if(key.type == Property::Key::INDEX &&
((mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) ||
(mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR)))
{
return Dali::Property(mImpl->mRenderer, VisualRenderer::Property::VISUAL_MIX_COLOR);
}
+
+ // Special case for BLUR_RADIUS
+ if(mImpl->mType == Toolkit::Visual::COLOR &&
+ ((key.type == Property::Key::INDEX && key.indexKey == DevelColorVisual::Property::BLUR_RADIUS) ||
+ (key.type == Property::Key::STRING && key.stringKey == BLUR_RADIUS_NAME)))
+ {
+ // Request to color-visual class
+ return OnGetPropertyObject(key);
+ }
}
}
+ // If it is not VisualRenderer property, check registered Renderer and Shader property.
+ Property::Index index = GetPropertyIndex(key);
+ if(index != Property::INVALID_INDEX)
+ {
+ return Dali::Property(mImpl->mRenderer, index);
+ }
+
// We can't find the property in the base class.
// Request to child class
return OnGetPropertyObject(key);
projects / platform / core / uifw / dali-toolkit.git / blobdiff