summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehwan Kim <jae.hwan.kim@samsung.com>2014-11-10 21:00:02 +0900
committerJaehwan Kim <jae.hwan.kim@samsung.com>2014-11-10 21:25:48 +0900
commit2fc76c8a88130f2509a433e1da0c97a38b64a82f (patch)
treedb01bd400e26ebf399dcc3bfad8e725e91118b2b
parent3013a7c5cbd728dd9bc5516ffb4bd4f505888bd4 (diff)
edje_calc: fix image set bug.
When the image is changed, the border should be reseted. @fix
-rw-r--r--src/lib/edje/edje_calc.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index a9379e4a4b..14627cd302 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2662,6 +2662,16 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
2662 if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale); 2662 if (sc == ZERO) sc = DIV(_edje_scale, ed->file->base_scale);
2663 2663
2664 _edje_real_part_image_set(ed, ep, &set, pos); 2664 _edje_real_part_image_set(ed, ep, &set, pos);
2665
2666 /* border */
2667 p3->type.common.spec.image.l = chosen_desc->image.border.l;
2668 p3->type.common.spec.image.r = chosen_desc->image.border.r;
2669
2670 p3->type.common.spec.image.t = chosen_desc->image.border.t;
2671 p3->type.common.spec.image.b = chosen_desc->image.border.b;
2672
2673 p3->type.common.spec.image.border_scale_by = chosen_desc->image.border.scale_by;
2674
2665 if (set && set->set) 2675 if (set && set->set)
2666 { 2676 {
2667#define SET_BORDER_DEFINED(Result, Value) Result = Value ? Value : Result; 2677#define SET_BORDER_DEFINED(Result, Value) Result = Value ? Value : Result;