summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-10-30 17:01:39 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-10-30 17:51:30 +0900
commitcda9532f446b1f465a6bc478e3a7d29a79b3573b (patch)
treedb75b533445155edb3c1c84f984f2ca5c696c65e
parent855959f24de41b87fd2e07ba3ac442a8a5344800 (diff)
edje_cc - add offset_scale/offscale per desc to allow offsets to scale
there already was this flag but only set implicitly with anchor stuff. allow to be able to set this flag explicitly to allow offsets to be scaled if part is marked to scale @feature
-rw-r--r--src/bin/edje/edje_cc_handlers.c29
1 files changed, 29 insertions, 0 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 3f83283c75..c6aed3de83 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -442,6 +442,7 @@ static void st_collections_group_parts_part_description_orientation_look_to(void
442static void st_collections_group_parts_part_description_orientation_angle_axis(void); 442static void st_collections_group_parts_part_description_orientation_angle_axis(void);
443static void st_collections_group_parts_part_description_orientation_quaternion(void); 443static void st_collections_group_parts_part_description_orientation_quaternion(void);
444static void st_collections_group_parts_part_description_scale(void); 444static void st_collections_group_parts_part_description_scale(void);
445static void st_collections_group_parts_part_description_offset_scale(void);
445static void st_collections_group_parts_part_description_mesh_primitive(void); 446static void st_collections_group_parts_part_description_mesh_primitive(void);
446static void ob_collections_group_parts_part_description_texture(void); 447static void ob_collections_group_parts_part_description_texture(void);
447static void st_collections_group_parts_part_description_texture_image(void); 448static void st_collections_group_parts_part_description_texture_image(void);
@@ -875,6 +876,7 @@ New_Statement_Handler statement_handlers[] =
875 {"collections.group.parts.part.description.rel2.to", st_collections_group_parts_part_description_rel2_to}, 876 {"collections.group.parts.part.description.rel2.to", st_collections_group_parts_part_description_rel2_to},
876 {"collections.group.parts.part.description.rel2.to_x", st_collections_group_parts_part_description_rel2_to_x}, 877 {"collections.group.parts.part.description.rel2.to_x", st_collections_group_parts_part_description_rel2_to_x},
877 {"collections.group.parts.part.description.rel2.to_y", st_collections_group_parts_part_description_rel2_to_y}, 878 {"collections.group.parts.part.description.rel2.to_y", st_collections_group_parts_part_description_rel2_to_y},
879 {"collections.group.parts.part.description.offset_scale", st_collections_group_parts_part_description_offset_scale},
878 {"collections.group.parts.part.description.anchors.top", st_collections_group_parts_part_description_anchors_top}, 880 {"collections.group.parts.part.description.anchors.top", st_collections_group_parts_part_description_anchors_top},
879 {"collections.group.parts.part.description.anchors.bottom", st_collections_group_parts_part_description_anchors_bottom}, 881 {"collections.group.parts.part.description.anchors.bottom", st_collections_group_parts_part_description_anchors_bottom},
880 {"collections.group.parts.part.description.anchors.left", st_collections_group_parts_part_description_anchors_left}, 882 {"collections.group.parts.part.description.anchors.left", st_collections_group_parts_part_description_anchors_left},
@@ -1165,6 +1167,7 @@ New_Statement_Handler statement_handlers_short[] =
1165 desc { 1167 desc {
1166 vis; -> visible: 1; 1168 vis; -> visible: 1;
1167 hid; -> visible: 0; 1169 hid; -> visible: 0;
1170 offscale; -> offset_scale: 1;
1168 } 1171 }
1169 } 1172 }
1170 } 1173 }
@@ -1192,6 +1195,7 @@ New_Statement_Handler statement_handlers_short_single[] =
1192 {"collections.group.parts.part.norequired", st_collections_group_parts_part_norequired}, 1195 {"collections.group.parts.part.norequired", st_collections_group_parts_part_norequired},
1193 {"collections.group.parts.part.description.vis", st_collections_group_parts_part_description_vis}, 1196 {"collections.group.parts.part.description.vis", st_collections_group_parts_part_description_vis},
1194 {"collections.group.parts.part.description.hid", st_collections_group_parts_part_description_hid}, 1197 {"collections.group.parts.part.description.hid", st_collections_group_parts_part_description_hid},
1198 {"collections.group.parts.part.description.offscale", st_collections_group_parts_part_description_offset_scale},
1195 {"collections.group.mouse", st_collections_group_mouse}, 1199 {"collections.group.mouse", st_collections_group_mouse},
1196 {"collections.group.nomouse", st_collections_group_nomouse}, 1200 {"collections.group.nomouse", st_collections_group_nomouse},
1197 {"collections.group.broadcast", st_collections_group_broadcast}, 1201 {"collections.group.broadcast", st_collections_group_broadcast},
@@ -12572,6 +12576,31 @@ st_collections_group_parts_part_description_scale(void)
12572} 12576}
12573 12577
12574/** 12578/**
12579 @page edcref
12580 @property
12581 offset_scale
12582 @parameters
12583 [1 or 0]
12584 @effect
12585 Makes rel1/2 offset values scale by scale factor like min/max if set
12586 to 1, otherwise 0 means they will not scale. 0 is the default. Note
12587 that the part as a whole has to be set to scale too like:
12588
12589 part { name: "partname"; scale: 1;
12590 ...
12591
12592 @endproperty
12593*/
12594static void
12595st_collections_group_parts_part_description_offset_scale(void)
12596{
12597 if (get_arg_count() == 1)
12598 current_desc->offset_is_scaled = parse_bool(0);
12599 else
12600 current_desc->offset_is_scaled = EINA_TRUE;
12601}
12602
12603/**
12575 @edcsubsection{collections_group_parts_description_texture, 12604 @edcsubsection{collections_group_parts_description_texture,
12576 Group.Parts.Part.Description.Texture} 12605 Group.Parts.Part.Description.Texture}
12577 */ 12606 */