Merge "DALi Version 1.1.10" into devel/master

[platform/core/uifw/dali-toolkit.git] / docs / content / programming-guide / background.h

diff --git a/docs/content/programming-guide/background.h b/docs/content/programming-guide/background.h
index 44972f4..132fe19 100644 (file)
--- a/docs/content/programming-guide/background.h
+++ b/docs/content/programming-guide/background.h
@@ -16,15 +16,15 @@ control.SetBackgroundColor( Dali::Color::RED );
 </td>
 </table>
 
-This can be used for ALL existing controls like TextView as well:
+This can be used for ALL existing controls like TextLabel as well:
 @code
-Dali::Toolkit::TextView textView = Dali::Toolkit::TextView::New( "Hello World" );
-textView.SetBackgroundColor( Dali::Color::RED );
+Dali::Toolkit::TextLabel label = Dali::Toolkit::TextLabel::New( "Hello World" );
+label.SetBackgroundColor( Dali::Color::RED );
 @endcode
 
 <table border=0 cellpadding=10><tr>
 <td>
-\image html BackgroundTextView.png
+\image html BackgroundTextLabel.png
 </td>
 </table>
 
@@ -57,5 +57,24 @@ then the above image will look like:
 </td>
 </table>
 
+@section background-renderer Background Renderer
+
+The background can be set to use a specified renderer, e.g the border renderer
+@code
+Property::Map renderer;
+renderer.Insert("rendererType","borderRenderer");
+renderer.Insert("borderColor",COLOR::RED);
+renderer.Insert("borderSize",20.f);
+
+control.SetProperty( Control::Property::BACKGROUND, renderer);
+@endcode
+
+then the above image will look like:
+<table border=0 cellpadding=10><tr>
+<td>
+\image html BackgroundBorder.png
+</td>
+</table>
+
 *
 */