projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[AT-SPI] Set ImageView non-highlightable by default" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
image-view
/
image-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index
031befd
..
f49f82d
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-97,9
+97,6
@@
void ImageView::OnInitialize()
return std::unique_ptr<Dali::Accessibility::Accessible>(
new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::IMAGE));
});
return std::unique_ptr<Dali::Accessibility::Accessible>(
new DevelControl::AccessibleImpl(actor, Dali::Accessibility::Role::IMAGE));
});
-
- //Enable highightability
- Self().SetProperty(Toolkit::DevelControl::Property::ACCESSIBILITY_HIGHLIGHTABLE, true);
}
void ImageView::SetImage(const Property::Map& map)
}
void ImageView::SetImage(const Property::Map& map)
@@
-300,10
+297,19
@@
void ImageView::OnCreateTransitions(Dali::Animation& animation, Dali::Toolkit::C
destinationVisual.CreatePropertyMap(destinationMap);
destinationVisual.CreatePropertyMap(destinationMap);
+ static auto findValue = [](const Property::Map& map, Property::Index index) -> Vector4 {
+ Property::Value* propertyValue = map.Find(index);
+ if(propertyValue)
+ {
+ return propertyValue->Get<Vector4>();
+ }
+ return Vector4{};
+ };
+
Vector4 sourceMixColor(0.0f, 0.0f, 0.0f, 0.0f);
Vector4 sourceCornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
Vector4 sourceMixColor(0.0f, 0.0f, 0.0f, 0.0f);
Vector4 sourceCornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
- Vector4 destinationMixColor =
destinationMap.Find(Dali::Toolkit::Visual::Property::MIX_COLOR)->Get<Vector4>(
);
- Vector4 destinationCornerRadius =
destinationMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>(
);
+ Vector4 destinationMixColor =
findValue(destinationMap, Dali::Toolkit::Visual::Property::MIX_COLOR
);
+ Vector4 destinationCornerRadius =
findValue(destinationMap, Toolkit::DevelVisual::Property::CORNER_RADIUS
);
Dali::Toolkit::ImageView sourceHandle = Dali::Toolkit::ImageView::DownCast(source);
Toolkit::Visual::Base sourceVisual;
Dali::Toolkit::ImageView sourceHandle = Dali::Toolkit::ImageView::DownCast(source);
Toolkit::Visual::Base sourceVisual;
@@
-317,11
+323,11
@@
void ImageView::OnCreateTransitions(Dali::Animation& animation, Dali::Toolkit::C
if(sourceVisual)
{
sourceVisual.CreatePropertyMap(sourceMap);
if(sourceVisual)
{
sourceVisual.CreatePropertyMap(sourceMap);
- sourceMixColor =
sourceMap.Find(Dali::Toolkit::Visual::Property::MIX_COLOR)->Get<Vector4>(
);
- sourceCornerRadius =
sourceMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>(
);
+ sourceMixColor =
findValue(sourceMap, Dali::Toolkit::Visual::Property::MIX_COLOR
);
+ sourceCornerRadius =
findValue(sourceMap, Toolkit::DevelVisual::Property::CORNER_RADIUS
);
}
}
- std::vector<Dali::Property> properties;
+ std::vector<Dali::Property>
properties;
std::vector<std::pair<Property::Value, Property::Value>> values;
if(Vector3(sourceMixColor) != Vector3(destinationMixColor))
std::vector<std::pair<Property::Value, Property::Value>> values;
if(Vector3(sourceMixColor) != Vector3(destinationMixColor))