diff options
author | kumar navneet <k.navneet@samsung.com> | 2015-05-13 16:18:47 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-05-13 16:20:22 +0200 |
commit | e6ed156e390919b8cd4fef4145cbc3abf075ebbf (patch) | |
tree | a2e9c244adbc92fab235cc58f12dce4052aea7f0 /src/bin/edje | |
parent | bfe8b7c05ec7f6aea6da8ab22acd865ce43df208 (diff) |
edje: fix parsing issue in edje_cc with bezier program transition.
Summary:
Issue: "CURRENT" param not considered while parsing cubic bezier transition in edje cc
Soln: parse 5,6 parameter if Curr is set else parse 4,5 parameter
Reviewers: cedric, shilpasingh
Reviewed By: shilpasingh
Subscribers: poornima.srinivasan, rajeshps, cedric, govi
Differential Revision: https://phab.enlightenment.org/D2488
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
Diffstat (limited to 'src/bin/edje')
-rw-r--r-- | src/bin/edje/edje_cc_handlers.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index fe11ddb6ee..78d11bb1c9 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c | |||
@@ -12390,10 +12390,20 @@ st_collections_group_programs_program_transition(void) | |||
12390 | FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0)); | 12390 | FROM_DOUBLE(parse_float_range(2, -999999999.0, 999999999.0)); |
12391 | current_program->tween.v2 = | 12391 | current_program->tween.v2 = |
12392 | FROM_DOUBLE(parse_float_range(3, -999999999.0, 999999999.0)); | 12392 | FROM_DOUBLE(parse_float_range(3, -999999999.0, 999999999.0)); |
12393 | current_program->tween.v3 = | 12393 | if (get_arg_count() == 7) |
12394 | FROM_DOUBLE(parse_float_range(4, -999999999.0, 999999999.0)); | 12394 | { |
12395 | current_program->tween.v4 = | 12395 | current_program->tween.v3 = |
12396 | FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0)); | 12396 | FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0)); |
12397 | current_program->tween.v4 = | ||
12398 | FROM_DOUBLE(parse_float_range(6, -999999999.0, 999999999.0)); | ||
12399 | } | ||
12400 | else | ||
12401 | { | ||
12402 | current_program->tween.v3 = | ||
12403 | FROM_DOUBLE(parse_float_range(4, -999999999.0, 999999999.0)); | ||
12404 | current_program->tween.v4 = | ||
12405 | FROM_DOUBLE(parse_float_range(5, -999999999.0, 999999999.0)); | ||
12406 | } | ||
12397 | } | 12407 | } |
12398 | } | 12408 | } |
12399 | 12409 | ||