summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-11-09 15:47:42 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-11-09 16:11:34 +0900
commitb52e9202cce08c08668e513cebe21375ef854cdb (patch)
tree8cf75e93b27e7cad0c4305d05644d233c033de74
parentbe99d116623df8709fdef54c451b7d38cbf21492 (diff)
doc: Add EDC doc for desc.proxy, fix for desc.fill
-rw-r--r--src/bin/edje/edje_cc_handlers.c123
1 files changed, 85 insertions, 38 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index b96647a68f..4d118c6db7 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -94,12 +94,11 @@
94 * <ul> 94 * <ul>
95 * <li>@ref sec_collections_group_parts_description_relatives "Relatives (rel1/rel2)"</li> 95 * <li>@ref sec_collections_group_parts_description_relatives "Relatives (rel1/rel2)"</li>
96 * <li>@ref sec_collections_group_parts_description_image "Image"</li> 96 * <li>@ref sec_collections_group_parts_description_image "Image"</li>
97 * <li>@ref sec_collections_group_parts_description_proxy "Proxy"</li>
98 * <li>@ref sec_collections_group_parts_description_fill "Fill"</li>
97 * <ul> 99 * <ul>
98 * <li>@ref sec_collections_group_parts_description_image_fill "Fill"</li> 100 * <li>@ref sec_collections_group_parts_description_fill_origin "Origin"</li>
99 * <ul> 101 * <li>@ref sec_collections_group_parts_description_fill_size "Size"</li>
100 * <li>@ref sec_collections_group_parts_description_image_fill_origin "Origin"</li>
101 * <li>@ref sec_collections_group_parts_description_image_fill_size "Size"</li>
102 * </ul>
103 * </ul> 102 * </ul>
104 * <li>@ref sec_collections_group_parts_description_text "Text"</li> 103 * <li>@ref sec_collections_group_parts_description_text "Text"</li>
105 * <li>@ref sec_collections_group_parts_description_box "Box"</li> 104 * <li>@ref sec_collections_group_parts_description_box "Box"</li>
@@ -8408,27 +8407,30 @@ st_collections_group_parts_part_description_image_scale_hint(void)
8408 NULL); 8407 NULL);
8409} 8408}
8410 8409
8411/** @edcsubsection{collections_group_parts_description_image_fill, 8410/** @edcsubsection{collections_group_parts_description_fill,
8412 * Group.Parts.Part.Description.Image.Fill} */ 8411 * Group.Parts.Part.Description.Fill} */
8413 8412
8414/** 8413/**
8415 @page edcref 8414 @page edcref
8416 @block 8415 @block
8417 fill 8416 fill
8418 @context 8417 @context
8419 image { 8418 part { type: IMAGE or PROXY;
8420 .. 8419 description {
8421 fill { 8420 ..
8422 type: SCALE; 8421 fill {
8423 smooth: 0-1; 8422 type: SCALE;
8424 origin { } 8423 smooth: 0-1;
8425 size { } 8424 origin { }
8425 size { }
8426 }
8427 ..
8426 } 8428 }
8427 .. 8429 ..
8428 } 8430 }
8429 @description 8431 @description
8430 The fill method is an optional block that defines the way an IMAGE part 8432 The fill method is an optional block that defines the way an IMAGE or
8431 is going to be displayed inside its container. 8433 PROXY part is going to be displayed inside its container.
8432 It can be used for tiling (repeating the image) or displaying only 8434 It can be used for tiling (repeating the image) or displaying only
8433 part of an image. See @ref evas_object_image_fill_set() documentation 8435 part of an image. See @ref evas_object_image_fill_set() documentation
8434 for more details. 8436 for more details.
@@ -8592,8 +8594,8 @@ st_collections_group_parts_part_description_fill_type(void)
8592 NULL); 8594 NULL);
8593} 8595}
8594 8596
8595/** @edcsubsection{collections_group_parts_description_image_fill_origin, 8597/** @edcsubsection{collections_group_parts_description_fill_origin,
8596 * Group.Parts.Part.Description.Image.Fill.Origin} */ 8598 * Group.Parts.Part.Description.Fill.Origin} */
8597 8599
8598/** 8600/**
8599 @page edcref 8601 @page edcref
@@ -8716,8 +8718,8 @@ st_collections_group_parts_part_description_fill_origin_offset(void)
8716 fill->pos_abs_y = parse_int(1); 8718 fill->pos_abs_y = parse_int(1);
8717} 8719}
8718 8720
8719/** @edcsubsection{collections_group_parts_description_image_fill_size, 8721/** @edcsubsection{collections_group_parts_description_fill_size,
8720 * Group.Parts.Part.Description.Image.Fill.Size} */ 8722 * Group.Parts.Part.Description.Fill.Size} */
8721 8723
8722/** 8724/**
8723 @page edcref 8725 @page edcref
@@ -9680,6 +9682,51 @@ static void st_collections_group_parts_part_description_table_padding(void)
9680 ed->table.padding.y = parse_int_range(1, 0, 0x7fffffff); 9682 ed->table.padding.y = parse_int_range(1, 0, 0x7fffffff);
9681} 9683}
9682 9684
9685/**
9686 @edcsubsection{collections_group_parts_description_proxy, Proxy}
9687 */
9688
9689/**
9690 @page edcref
9691
9692 @block
9693 proxy
9694 @context
9695 part { type: PROXY;
9696 description {
9697 ..
9698 proxy {
9699 source_clip: 1;
9700 source_visible: 1;
9701 }
9702 ..
9703 }
9704 }
9705 @description
9706 State flags used for proxy objects.
9707 @endblock
9708
9709 @property
9710 source_clip
9711 @parameters
9712 [0 or 1]
9713 @effect
9714 Sets the 'source_clip' property on this PROXY object. True by default,
9715 this means the proxy will be clipped by its source clipper. False
9716 means the source clipper is ignored when rendering the proxy.
9717 @endproperty
9718
9719 @property
9720 source_visible
9721 @parameters
9722 [0 or 1]
9723 @effect
9724 Sets the 'source_visible' property on this PROXY object. True by
9725 default, meaning both the proxy and its source object will be visible.
9726 If false, the source object will not be visible. False is equivalent
9727 to setting the 'no_render' flag on the source object itself.
9728 @endproperty
9729*/
9683static void 9730static void
9684st_collections_group_parts_part_description_proxy_source_clip(void) 9731st_collections_group_parts_part_description_proxy_source_clip(void)
9685{ 9732{
@@ -9698,6 +9745,24 @@ st_collections_group_parts_part_description_proxy_source_clip(void)
9698 ed->proxy.source_clip = parse_bool(0); 9745 ed->proxy.source_clip = parse_bool(0);
9699} 9746}
9700 9747
9748static void
9749st_collections_group_parts_part_description_proxy_source_visible(void)
9750{
9751 Edje_Part_Description_Proxy *ed;
9752
9753 check_arg_count(1);
9754
9755 if (current_part->type != EDJE_PART_TYPE_PROXY)
9756 {
9757 ERR("parse error %s:%i. proxy attributes in non-PROXY part.",
9758 file_in, line - 1);
9759 exit(-1);
9760 }
9761
9762 ed = (Edje_Part_Description_Proxy*) current_desc;
9763 ed->proxy.source_visible = parse_bool(0);
9764}
9765
9701/** 9766/**
9702 @edcsubsection{collections_group_parts_description_positon,Position} 9767 @edcsubsection{collections_group_parts_description_positon,Position}
9703 */ 9768 */
@@ -10826,24 +10891,6 @@ st_collections_group_parts_part_description_mesh_geometry(void)
10826} 10891}
10827 10892
10828static void 10893static void
10829st_collections_group_parts_part_description_proxy_source_visible(void)
10830{
10831 Edje_Part_Description_Proxy *ed;
10832
10833 check_arg_count(1);
10834
10835 if (current_part->type != EDJE_PART_TYPE_PROXY)
10836 {
10837 ERR("parse error %s:%i. proxy attributes in non-PROXY part.",
10838 file_in, line - 1);
10839 exit(-1);
10840 }
10841
10842 ed = (Edje_Part_Description_Proxy*) current_desc;
10843 ed->proxy.source_visible = parse_bool(0);
10844}
10845
10846static void
10847st_collections_group_parts_part_description_table_min(void) 10894st_collections_group_parts_part_description_table_min(void)
10848{ 10895{
10849 Edje_Part_Description_Table *ed; 10896 Edje_Part_Description_Table *ed;