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
ImageRenderer provides property to indicate async/sync resource loading
[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
e50e961
..
03229f9
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-44,8
+44,7
@@
DALI_TYPE_REGISTRATION_END()
using namespace Dali;
ImageView::ImageView()
using namespace Dali;
ImageView::ImageView()
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),
- mPremultipledAlphaEnabled( false )
+: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) )
{
}
{
}
@@
-305,10
+304,10
@@
void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
{
case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
{
- bool
I
sPre;
- if( value.Get(
I
sPre ) )
+ bool
i
sPre;
+ if( value.Get(
i
sPre ) )
{
{
- GetImpl(imageView).EnablePreMultipliedAlpha(
I
sPre );
+ GetImpl(imageView).EnablePreMultipliedAlpha(
i
sPre );
}
break;
}
}
break;
}