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
Remove Constraints from Cluster,ToolBar,View & ImageView
[platform/core/uifw/dali-toolkit.git]
/
optional
/
dali-toolkit
/
internal
/
controls
/
image-view
/
image-view-impl.cpp
diff --git
a/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
b/optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index
2601644
..
7cb6cb4
100644
(file)
--- a/
optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
optional/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-15,7
+15,14
@@
*
*/
*
*/
+// CLASS HEADER
#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/object/type-registry.h>
+
+// INTERNAL INCLUDES
#include <dali-toolkit/public-api/shader-effects/distance-field-effect.h>
using namespace Dali;
#include <dali-toolkit/public-api/shader-effects/distance-field-effect.h>
using namespace Dali;
@@
-87,7
+94,8
@@
Dali::Toolkit::ImageView ImageView::New()
}
ImageView::ImageView()
}
ImageView::ImageView()
-: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) )
+: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ),
+ mPropertyDetail( Property::INVALID_INDEX )
{
}
{
}
@@
-101,7
+109,6
@@
void ImageView::Initialize()
Image emptyImage;
mImageActor = ImageActor::New( emptyImage );
self.Add( mImageActor );
Image emptyImage;
mImageActor = ImageActor::New( emptyImage );
self.Add( mImageActor );
- mImageActor.ApplyConstraint( Constraint::New<Vector3>( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) );
mImageActor.SetParentOrigin( ParentOrigin::CENTER );
}
mImageActor.SetParentOrigin( ParentOrigin::CENTER );
}
@@
-110,6
+117,11
@@
ImageView::~ImageView()
}
}
+void ImageView::OnControlSizeSet( const Vector3& targetSize )
+{
+ mImageActor.SetSize( targetSize );
+}
+
void ImageView::SetImage(const std::string& filename, ImageType type, float min, float max)
{
switch(type)
void ImageView::SetImage(const std::string& filename, ImageType type, float min, float max)
{
switch(type)