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 "Text - Move cursor's position related code to a different file." into devel...
[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
3eb0144
..
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
@@
-6,7
+6,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/object/type-registry.h>
// EXTERNAL INCLUDES
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/
devel
-api/object/type-registry-helper.h>
+#include <dali/
public
-api/object/type-registry-helper.h>
#include <dali/devel-api/scripting/scripting.h>
// INTERNAL INCLUDES
#include <dali/devel-api/scripting/scripting.h>
// INTERNAL INCLUDES
@@
-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 ) )
{
}
{
}
@@
-142,6
+141,11
@@
void ImageView::SetImage( const std::string& url, ImageDimensions size )
}
}
}
}
+Image ImageView::GetImage() const
+{
+ return mImage;
+}
+
void ImageView::EnablePreMultipliedAlpha( bool preMultipled )
{
if( mRenderer )
void ImageView::EnablePreMultipliedAlpha( bool preMultipled )
{
if( mRenderer )
@@
-300,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;
}