Peter M. Groen / dali-demo

Commit 7be9f30032c9a694c9f18bd03533822bd2dc2075

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 8b9c89c6 8af5f821

Merge "Updates for Visual::SetSize removal" into devel/master

Inline Side-by-side
Showing 1 changed file with 12 additions and 1 deletions
examples/styling/image-channel-control-impl.cpp
  View file @7be9f30
@@ -17,7 +17,10 @@ @@ -17,7 +17,10 @@
17 #include "image-channel-control-impl.h" 17 #include "image-channel-control-impl.h"
18 #include <dali-toolkit/dali-toolkit.h> 18 #include <dali-toolkit/dali-toolkit.h>
19 #include <dali/public-api/object/type-registry-helper.h> 19 #include <dali/public-api/object/type-registry-helper.h>
  20 +#include <dali-toolkit/devel-api/align-enums.h>
20 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h> 21 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
  22 +#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
  23 +
21 #include <cstdio> 24 #include <cstdio>
22 25
23 using namespace Dali; // Needed for macros 26 using namespace Dali; // Needed for macros
@@ -176,7 +179,15 @@ void ImageChannelControl::OnSizeSet( const Vector3&amp; targetSize ) @@ -176,7 +179,15 @@ void ImageChannelControl::OnSizeSet( const Vector3&amp; targetSize )
176 if( mVisual ) 179 if( mVisual )
177 { 180 {
178 Vector2 size( targetSize ); 181 Vector2 size( targetSize );
179 - mVisual.SetSize( size ); 182 + Property::Map transformMap;
  183 + transformMap
  184 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
  185 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
  186 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
  187 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
  188 + .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO );
  189 +
  190 + mVisual.SetTransformAndSize( transformMap, size );
180 } 191 }
181 } 192 }
182 193