Date: Thu, 24 Mar 2016 13:39:58 +0000 (-0700)
Subject: Merge "Fix for text renderer. Set the right size in order to cull the actor correctly...
X-Git-Tag: dali_1.1.28~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0f60c9d852e981b0a43a46763e074518af297cfe;hp=95b3d088e01890ea7d105b98e6a7759903a42dfc
Merge "Fix for text renderer. Set the right size in order to cull the actor correctly." into devel/master
---
diff --git a/docs/content/images/renderers/svg-renderer.svg b/docs/content/images/renderers/svg-renderer.svg
new file mode 100755
index 0000000..b7d5476
--- /dev/null
+++ b/docs/content/images/renderers/svg-renderer.svg
@@ -0,0 +1,491 @@
+
+
+
+
diff --git a/docs/content/programming-guide/image-view.h b/docs/content/programming-guide/image-view.h
index 5822da5..63a1030 100644
--- a/docs/content/programming-guide/image-view.h
+++ b/docs/content/programming-guide/image-view.h
@@ -24,6 +24,11 @@
* Dali::Toolkit::ImageView myImageView = ImageView::New( "source-image-url.9.png" );
* @endcode
*
+ * A path to a svg image file:
+ * @code
+ * Dali::Toolkit::ImageView myImageView = ImageView::New( "source-image-url.svg" );
+ * @endcode
+ *
*
Loading from a Image handle
* Dali::Image is an abstract base class with multiple derived classes.
*
diff --git a/docs/content/shared-javascript-and-cpp-documentation/control-renderers.md b/docs/content/shared-javascript-and-cpp-documentation/control-renderers.md
index 43f0d16..6966e42 100644
--- a/docs/content/shared-javascript-and-cpp-documentation/control-renderers.md
+++ b/docs/content/shared-javascript-and-cpp-documentation/control-renderers.md
@@ -14,6 +14,7 @@ DALi provides the following renderers:
+ [Gradient](@ref gradient-renderer)
+ [Image](@ref image-renderer)
+ [N-Patch](@ref n-patch-renderer)
+ + [SVG](@ref svg-renderer)
+ [Border](@ref border-renderer)
Controls can provide properties that allow users to specify the renderer type.
@@ -295,6 +296,58 @@ control.background =
imageUrl : "path-to-image.9.png"
};
~~~
+
+___________________________________________________________________________________________________
+
+## SVG Renderer {#svg-renderer}
+
+Renders a svg image into the control's quad.
+
+