Revert "edje: add fixed automatically for optimizing edje calc speed." 62/78062/2 accepted/tizen/common/20160706.141413 accepted/tizen/ivi/20160705.044703 accepted/tizen/ivi/20160705.100558 accepted/tizen/mobile/20160705.044642 accepted/tizen/mobile/20160705.100720 accepted/tizen/tv/20160705.044654 accepted/tizen/tv/20160705.100617 accepted/tizen/wearable/20160705.044633 accepted/tizen/wearable/20160705.100644 submit/tizen/20160704.103858 submit/tizen/20160705.032109
authorkim hosang <hosang12.kim@samsung.com>
Mon, 4 Jul 2016 07:04:11 +0000 (00:04 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 4 Jul 2016 07:04:22 +0000 (00:04 -0700)
This reverts commit eccf071dd53721d1a4d8e81b1851a0135ccacc03.

Change-Id: I36aad155920d86a7294709f6776e9ab94b485383

src/lib/edje/edje_calc.c

index 9f407a2..864ee9b 100644 (file)
@@ -2722,7 +2722,6 @@ _edje_part_recalc_single(Edje *ed,
    Edje_Color_Class *cc = NULL;
    Edje_Internal_Aspect apref;
    int minw = 0, minh = 0, maxw = 0, maxh = 0;
-   Eina_Bool fixedw = EINA_FALSE, fixedh = EINA_FALSE;
    FLOAT_T sc;
 
    sc = DIV(ed->scale, ed->file->base_scale);
@@ -2740,26 +2739,6 @@ _edje_part_recalc_single(Edje *ed,
    /* size step */
    _edje_part_recalc_single_step(desc, params);
 
-   /* check whether this part has fixed value or not*/
-   if ((rel1_to_x == rel2_to_x) &&
-       (desc->rel1.relative_x == desc->rel2.relative_x) &&
-       (!chosen_desc->fixed.w))
-     {
-        chosen_desc->fixed.w = 1;
-        fixedw = EINA_TRUE;
-     }
-
-   if ((rel1_to_y == rel2_to_y) &&
-       (desc->rel1.relative_y == desc->rel2.relative_y) &&
-       (!chosen_desc->fixed.h))
-     {
-        chosen_desc->fixed.h = 1;
-        fixedh = EINA_TRUE;
-     }
-   if (fixedw || fixedh)
-     WRN("file %s, group %s has a non-fixed part '%s'. You should add 'fixed: %d %d'. But in order to optimize the edje calc, we add it automatically.",ed->path, ed->group, ep->part->name, fixedw, fixedh);
-
-
    /* colors */
    if (ep->part->type != EDJE_PART_TYPE_SPACER)
      {