summaryrefslogtreecommitdiff
path: root/src/lib/edje/edje_calc.c
diff options
context:
space:
mode:
authorWonki Kim <wonki_.kim@samsung.com>2020-02-19 12:40:39 -0500
committerMike Blumenkrantz <zmike@samsung.com>2020-02-19 12:40:39 -0500
commit7da106ec681195a5538cfcf0da2cf4805173c23e (patch)
treedb8d36e85289c1dabfe5d3e88f1821d8bdfde119 /src/lib/edje/edje_calc.c
parentc2738b4ed9d0361049c3f83dbdd050f750ad7b72 (diff)
edje: modify to respect user set fixed property
Summary: this patch is related with @D11365. rather than undoing optimization edje calc, this patch introduces a user_set property which enables edje_calc to respect user set property. Reviewers: bu5hm4n, eagleeye, YOhoho, Hermet, zmike Reviewed By: zmike Subscribers: zmike, cedric, #reviewers, #committers, woohyun, eagleeye, bu5hm4n Tags: #efl Differential Revision: https://phab.enlightenment.org/D11366
Diffstat (limited to '')
-rw-r--r--src/lib/edje/edje_calc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 30f556d722..7de6c66db6 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2993,14 +2993,14 @@ _edje_part_recalc_single(Edje *ed,
2993 /* check whether this part has fixed value or not*/ 2993 /* check whether this part has fixed value or not*/
2994 if ((rel1_to_x == rel2_to_x) && 2994 if ((rel1_to_x == rel2_to_x) &&
2995 (EQ(desc->rel1.relative_x, desc->rel2.relative_x)) && 2995 (EQ(desc->rel1.relative_x, desc->rel2.relative_x)) &&
2996 (!chosen_desc->fixed.w)) 2996 (!chosen_desc->fixed.w) && (!chosen_desc->user_set.fixed))
2997 { 2997 {
2998 chosen_desc->fixed.w = 1; 2998 chosen_desc->fixed.w = 1;
2999 fixedw = EINA_TRUE; 2999 fixedw = EINA_TRUE;
3000 } 3000 }
3001 if ((rel1_to_y == rel2_to_y) && 3001 if ((rel1_to_y == rel2_to_y) &&
3002 (EQ(desc->rel1.relative_y, desc->rel2.relative_y)) && 3002 (EQ(desc->rel1.relative_y, desc->rel2.relative_y)) &&
3003 (!chosen_desc->fixed.h)) 3003 (!chosen_desc->fixed.h) && (!chosen_desc->user_set.fixed))
3004 { 3004 {
3005 chosen_desc->fixed.h = 1; 3005 chosen_desc->fixed.h = 1;
3006 fixedh = EINA_TRUE; 3006 fixedh = EINA_TRUE;