Change-Id: I9ce229371743d81460e6866ac8b59b54ca7878b5
- Dali::Image emptyImage;
- SetForegroundImage(emptyImage);
+ Dali::Texture emptyTexture;
+ SetForegroundImage( emptyTexture );
}
void Indicator::SetOpacityMode( Dali::Window::IndicatorBgOpacity mode )
}
void Indicator::SetOpacityMode( Dali::Window::IndicatorBgOpacity mode )
if( nativeImageSource )
{
if( nativeImageSource )
{
- SetForegroundImage( Dali::NativeImage::New(*nativeImageSource) );
+ Dali::Texture texture = Dali::Texture::New( *nativeImageSource );
+ SetForegroundImage( texture );
mIndicatorContentActor.SetSize( mImageWidth, mImageHeight );
mIndicatorActor.SetSize( mImageWidth, mImageHeight );
mIndicatorContentActor.SetSize( mImageWidth, mImageHeight );
mIndicatorActor.SetSize( mImageWidth, mImageHeight );
- mEventActor.SetSize(mImageWidth, mImageHeight);
+ mEventActor.SetSize( mImageWidth, mImageHeight );
{
DALI_LOG_TRACE_METHOD_FMT( gIndicatorLogFilter, "W:%d H:%d", mSharedFileInfo[bufferNumber].mImageWidth, mSharedFileInfo[bufferNumber].mImageHeight );
mIndicatorBuffer = new IndicatorBuffer( mAdaptor, mSharedFileInfo[bufferNumber].mImageWidth, mSharedFileInfo[bufferNumber].mImageHeight, Pixel::BGRA8888 );
{
DALI_LOG_TRACE_METHOD_FMT( gIndicatorLogFilter, "W:%d H:%d", mSharedFileInfo[bufferNumber].mImageWidth, mSharedFileInfo[bufferNumber].mImageHeight );
mIndicatorBuffer = new IndicatorBuffer( mAdaptor, mSharedFileInfo[bufferNumber].mImageWidth, mSharedFileInfo[bufferNumber].mImageHeight, Pixel::BGRA8888 );
- Dali::Image image = Dali::NativeImage::New( mIndicatorBuffer->GetNativeImage() );
if( CopyToBuffer( bufferNumber ) ) // Only create images if we have valid image buffer
{
if( CopyToBuffer( bufferNumber ) ) // Only create images if we have valid image buffer
{
- SetForegroundImage( image );
+ Dali::Texture texture = Dali::Texture::New( mIndicatorBuffer->GetNativeImage() );
+ if( texture )
+ {
+ SetForegroundImage( texture );
+ success = true;
+ }
{
DALI_LOG_WARNING("### Cannot create indicator image - disconnecting ###\n");
Disconnect();
{
DALI_LOG_WARNING("### Cannot create indicator image - disconnecting ###\n");
Disconnect();
return Dali::Geometry();
}
return Dali::Geometry();
}
-void Indicator::SetForegroundImage( Dali::Image image )
+void Indicator::SetForegroundImage( Dali::Texture texture )
- if( !mForegroundRenderer && image )
+ if( !mForegroundRenderer && texture )
{
// Create Shader
Dali::Shader shader = Dali::Shader::New( FOREGROUND_VERTEX_SHADER, FOREGROUND_FRAGMENT_SHADER );
{
// Create Shader
Dali::Shader shader = Dali::Shader::New( FOREGROUND_VERTEX_SHADER, FOREGROUND_FRAGMENT_SHADER );
// Create a texture-set and add to renderer
Dali::TextureSet textureSet = Dali::TextureSet::New();
// Create a texture-set and add to renderer
Dali::TextureSet textureSet = Dali::TextureSet::New();
- textureSet.SetImage( 0u, image );
+ textureSet.SetTexture( 0u, texture );
mForegroundRenderer.SetTextures( textureSet );
mIndicatorContentActor.AddRenderer( mForegroundRenderer );
mForegroundRenderer.SetTextures( textureSet );
mIndicatorContentActor.AddRenderer( mForegroundRenderer );
else if( mForegroundRenderer )
{
Dali::TextureSet textureSet = mForegroundRenderer.GetTextures();
else if( mForegroundRenderer )
{
Dali::TextureSet textureSet = mForegroundRenderer.GetTextures();
- textureSet.SetImage( 0u, image );
+ textureSet.SetTexture( 0u, texture );
- if( mImageWidth == 0 && mImageHeight == 0 && image)
+ if( mImageWidth == 0 && mImageHeight == 0 && texture)
- Resize( image.GetWidth(), image.GetHeight() );
+ Resize( texture.GetWidth(), texture.GetHeight() );
Dali::Geometry CreateBackgroundGeometry();
/**
Dali::Geometry CreateBackgroundGeometry();
/**
- * Set the image to be rendered as indicator foreground
- * @param[in] image The foreground image.
+ * Set the texture to be rendered as indicator foreground
+ * @param[in] texture The foreground texture.
- void SetForegroundImage( Dali::Image image );
+ void SetForegroundImage( Dali::Texture texture );
/**
* Touch event callback.
/**
* Touch event callback.