summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/edje/edje_util.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index c1ae49c86f..b96715cabd 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -2991,7 +2991,7 @@ _edje_object_size_min_restricted_calc(Eo *obj EINA_UNUSED, Edje *ed, Evas_Coord
2991 Eina_Bool repeat_w, repeat_h; 2991 Eina_Bool repeat_w, repeat_h;
2992 Eina_Bool reset_max = EINA_TRUE; 2992 Eina_Bool reset_max = EINA_TRUE;
2993 Edje_Real_Part *pep = NULL; 2993 Edje_Real_Part *pep = NULL;
2994 Eina_Bool has_non_fixed_tb = EINA_FALSE; 2994 Eina_Bool has_fixed_tb;
2995 2995
2996 if ((!ed) || (!ed->collection)) 2996 if ((!ed) || (!ed->collection))
2997 { 2997 {
@@ -3033,7 +3033,7 @@ again:
3033 } 3033 }
3034 3034
3035 pep = NULL; 3035 pep = NULL;
3036 has_non_fixed_tb = EINA_FALSE; 3036 has_fixed_tb = EINA_TRUE;
3037 3037
3038 //for parts 3038 //for parts
3039 for (i = 0; i < ed->table_parts_size; i++) 3039 for (i = 0; i < ed->table_parts_size; i++)
@@ -3059,7 +3059,7 @@ again:
3059 &tb_mw, NULL); 3059 &tb_mw, NULL);
3060 tb_mw -= ep->req.w; 3060 tb_mw -= ep->req.w;
3061 if (tb_mw > over_w) over_w = tb_mw; 3061 if (tb_mw > over_w) over_w = tb_mw;
3062 has_non_fixed_tb = EINA_TRUE; 3062 has_fixed_tb = EINA_FALSE;
3063 } 3063 }
3064 3064
3065 if (over_w > max_over_w) 3065 if (over_w > max_over_w)
@@ -3086,7 +3086,7 @@ again:
3086 } 3086 }
3087 3087
3088 if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) 3088 if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)
3089 has_non_fixed_tb = EINA_TRUE; 3089 has_fixed_tb = EINA_FALSE;
3090 } 3090 }
3091 } 3091 }
3092 if (repeat_w) 3092 if (repeat_w)
@@ -3109,7 +3109,7 @@ again:
3109 /* Only print it if we have a non-fixed textblock. 3109 /* Only print it if we have a non-fixed textblock.
3110 * We should possibly avoid all of this if in this case, but in 3110 * We should possibly avoid all of this if in this case, but in
3111 * the meanwhile, just doing this. */ 3111 * the meanwhile, just doing this. */
3112 if (!has_non_fixed_tb) 3112 if (!has_fixed_tb)
3113 { 3113 {
3114 if (pep) 3114 if (pep)
3115 ERR("file %s, group %s has a non-fixed part '%s'. Adding 'fixed: 1 1;' to source EDC may help. Continuing discarding faulty part.", 3115 ERR("file %s, group %s has a non-fixed part '%s'. Adding 'fixed: 1 1;' to source EDC may help. Continuing discarding faulty part.",