Peter M. Groen / dali-demo

Commit 24424fa546dad5bfac1920097c48d9016f59b29c

Authored by Umar
2 parents 9d5194d7 bde9980e

[dali_1.2.63] Merge branch 'devel/master' 

Change-Id: Ibcd4c26f16c32f32af29e1288a5654fb6c78f05b
Inline Side-by-side
Showing 3 changed files with 9 additions and 5 deletions
examples/text-label/text-label-example.cpp
  View file @24424fa
@@ -303,8 +303,11 @@ public: @@ -303,8 +303,11 @@ public:
303 303
304 mShadowActive = ( shadowOffset == Vector2::ZERO ) ? false : true; 304 mShadowActive = ( shadowOffset == Vector2::ZERO ) ? false : true;
305 305
306 - mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, shadowOffset );  
307 - mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, mSelectedColor ); 306 + Property::Map shadowMap;
  307 + shadowMap.Insert( "offset", shadowOffset );
  308 + shadowMap.Insert( "color", mSelectedColor );
  309 + shadowMap.Insert( "blurRadius", 2.0f );
  310 + mLabel.SetProperty( TextLabel::Property::SHADOW, shadowMap );
308 } 311 }
309 return true; 312 return true;
310 } 313 }
packaging/com.samsung.dali-demo.spec
  View file @24424fa
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.2.62 5 +Version: 1.2.63
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
shared/utility.h
  View file @24424fa
@@ -29,9 +29,10 @@ namespace DemoHelper @@ -29,9 +29,10 @@ namespace DemoHelper
29 Dali::Texture LoadTexture( const char* imagePath, 29 Dali::Texture LoadTexture( const char* imagePath,
30 Dali::ImageDimensions size = Dali::ImageDimensions(), 30 Dali::ImageDimensions size = Dali::ImageDimensions(),
31 Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT, 31 Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT,
32 - Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT ) 32 + Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT,
  33 + bool orientationCorrection = true )
33 { 34 {
34 - Dali::Devel::PixelBuffer pixelBuffer = LoadImageFromFile(imagePath, size, fittingMode, samplingMode); 35 + Dali::Devel::PixelBuffer pixelBuffer = LoadImageFromFile(imagePath, size, fittingMode, samplingMode, orientationCorrection );
35 Dali::Texture texture = Dali::Texture::New( Dali::TextureType::TEXTURE_2D, 36 Dali::Texture texture = Dali::Texture::New( Dali::TextureType::TEXTURE_2D,
36 pixelBuffer.GetPixelFormat(), 37 pixelBuffer.GetPixelFormat(),
37 pixelBuffer.GetWidth(), 38 pixelBuffer.GetWidth(),