diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2015-08-18 21:14:11 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2015-10-01 20:10:54 +0900 |
commit | 31edfbb817d24dc11224e6f68e6dcd12282ca5f8 (patch) | |
tree | 8bc0c86a8f1091e4fdc3f498a56ed2b8b87d1523 /src/bin/edje | |
parent | 99b1c7622ba3ee0358d491d048f115eed3031d34 (diff) |
Edje: Add support for filters to PROXY parts
Same syntax as for IMAGE and TEXT: description.filter
Diffstat (limited to 'src/bin/edje')
-rw-r--r-- | src/bin/edje/edje_cc_handlers.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 18adacb1ae..b4530c96b3 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c | |||
@@ -11911,9 +11911,11 @@ st_collections_group_parts_part_description_filter_code(void) | |||
11911 | filter = &(((Edje_Part_Description_Text *)current_desc)->filter); | 11911 | filter = &(((Edje_Part_Description_Text *)current_desc)->filter); |
11912 | else if (current_part->type == EDJE_PART_TYPE_IMAGE) | 11912 | else if (current_part->type == EDJE_PART_TYPE_IMAGE) |
11913 | filter = &(((Edje_Part_Description_Image *)current_desc)->filter); | 11913 | filter = &(((Edje_Part_Description_Image *)current_desc)->filter); |
11914 | else if (current_part->type == EDJE_PART_TYPE_PROXY) | ||
11915 | filter = &(((Edje_Part_Description_Proxy *)current_desc)->filter); | ||
11914 | else | 11916 | else |
11915 | { | 11917 | { |
11916 | ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.", | 11918 | ERR("parse error %s:%i. filter only supported for: TEXT, IMAGE, PROXY.", |
11917 | file_in, line - 1); | 11919 | file_in, line - 1); |
11918 | exit(-1); | 11920 | exit(-1); |
11919 | } | 11921 | } |
@@ -11952,6 +11954,8 @@ st_collections_group_parts_part_description_filter_source(void) | |||
11952 | filter = &(((Edje_Part_Description_Text *)current_desc)->filter); | 11954 | filter = &(((Edje_Part_Description_Text *)current_desc)->filter); |
11953 | else if (current_part->type == EDJE_PART_TYPE_IMAGE) | 11955 | else if (current_part->type == EDJE_PART_TYPE_IMAGE) |
11954 | filter = &(((Edje_Part_Description_Image *)current_desc)->filter); | 11956 | filter = &(((Edje_Part_Description_Image *)current_desc)->filter); |
11957 | else if (current_part->type == EDJE_PART_TYPE_PROXY) | ||
11958 | filter = &(((Edje_Part_Description_Proxy *)current_desc)->filter); | ||
11955 | else | 11959 | else |
11956 | { | 11960 | { |
11957 | ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.", | 11961 | ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.", |
@@ -12045,6 +12049,8 @@ st_collections_group_parts_part_description_filter_data(void) | |||
12045 | filter = &(((Edje_Part_Description_Text *)current_desc)->filter); | 12049 | filter = &(((Edje_Part_Description_Text *)current_desc)->filter); |
12046 | else if (current_part->type == EDJE_PART_TYPE_IMAGE) | 12050 | else if (current_part->type == EDJE_PART_TYPE_IMAGE) |
12047 | filter = &(((Edje_Part_Description_Image *)current_desc)->filter); | 12051 | filter = &(((Edje_Part_Description_Image *)current_desc)->filter); |
12052 | else if (current_part->type == EDJE_PART_TYPE_PROXY) | ||
12053 | filter = &(((Edje_Part_Description_Proxy *)current_desc)->filter); | ||
12048 | else | 12054 | else |
12049 | { | 12055 | { |
12050 | ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.", | 12056 | ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.", |