// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA )
DALI_TYPE_REGISTRATION_END()
-
-void SetDefaultTransformMap( Property::Map& transformMap )
-{
- transformMap.Clear();
- transformMap
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
- .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO );
-
-}
-
} // anonymous namespace
using namespace Dali;
mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size );
RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual );
- // This transform fills the control
- // Should provide a transform that handles aspect ratio according to image size
- Property::Map transformMap;
- SetDefaultTransformMap( transformMap );
- mVisual.SetTransformAndSize( transformMap, mSizeSet );
-
RelayoutRequest();
}
}
}
}
-
-///////////////////////////////////////////////////////////
-//
-// Private methods
-//
-
-void ImageView::OnSizeSet( const Vector3& targetSize )
+void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
{
- Control::OnSizeSet( targetSize );
- mSizeSet = targetSize;
+ Control::OnRelayout( size, container );
if( mVisual )
{
- Vector2 size( targetSize );
-
- // This transform fills the control
+ // Pass in an empty map which uses default transform values meaning our visual fills the control
// Should provide a transform that handles aspect ratio according to image size
- Property::Map transformMap;
- SetDefaultTransformMap( transformMap );
- mVisual.SetTransformAndSize( transformMap, size );
+ mVisual.SetTransformAndSize( Property::Map(), size );
}
}
map = value.GetMap();
if( map )
{
- Property::Value* shaderValue = map->Find( Toolkit::VisualProperty::SHADER, CUSTOM_SHADER );
+ Property::Value* shaderValue = map->Find( Toolkit::DevelVisual::Property::SHADER, CUSTOM_SHADER );
// set image only if property map contains image information other than custom shader
if( map->Count() > 1u || !shaderValue )
{