From cc7b4a15e327e29229c9ed7145455b967314ed51 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 19 Feb 2013 11:46:21 +0000
Subject: [PATCH] Edje entry: Fixed a fit issue with fitting even when
 disabled.

---
 src/lib/edje/edje_calc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 62a85809d4..5b1bf1d5d2 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1356,7 +1356,9 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
 
                   /* If we are still too big, try reducing the size to
                    * 95% each try. */
-                  while ((i > 0) && ((fw > params->w) || (fh > params->h)))
+                  while ((i > 0) &&
+                        ((chosen_desc->text.fit_x && (fw > params->w)) ||
+                         (chosen_desc->text.fit_y && (fh > params->h))))
                     {
                        double tmp_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s, s * 0.95);