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::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
- .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
- .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
- .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
- .Add( Toolkit::DevelVisual::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 );
}
}
#define __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
private: // From Control
/**
- * @copydoc Toolkit::Control::OnSizeSet()
- */
- virtual void OnSizeSet( const Vector3& targetSize );
-
- /**
* @copydoc Toolkit::Control::GetNaturalSize
*/
virtual Vector3 GetNaturalSize();
*/
virtual float GetWidthForHeight( float height );
+ /**
+ * @copydoc Toolkit::Control::OnRelayout()
+ */
+ virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
+
private:
// Undefined
ImageView( const ImageView& );
private:
Toolkit::Visual::Base mVisual;
ImageDimensions mImageSize;
- Vector2 mSizeSet;
std::string mUrl; ///< the url for the image if the image came from a URL, empty otherwise
Image mImage; ///< the Image if the image came from a Image, null otherwise