From 31d4f2699b0cb1eae5d9516e92e66a1550ba729f Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Thu, 28 Apr 2011 15:29:50 +0000
Subject: [PATCH] Edje size_min_restricted_calc: Hopefully fixed textblock
 handling.

SVN revision: 59010
---
 legacy/edje/ChangeLog           |  4 ++++
 legacy/edje/src/lib/edje_util.c | 15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 511ee736a8..113f64e4b8 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -80,3 +80,7 @@
 	* Add Feature: Support explicit shadow direction with extra effect
         param (optional). Default as before.
 
+2011-04-28  Tom Hacohen (TAsn)
+
+        * size_min_restricted_calc: Fixed textblock handling.
+
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index cfbc43d652..6408c8b3c2 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -2203,6 +2203,17 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
 	       {
 		  if (!ep->chosen_description->fixed.w)
 		    {
+		       if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
+			 {
+                            Evas_Coord tb_mw;
+                            evas_object_textblock_size_formatted_get(ep->object,
+                               &tb_mw, NULL);
+                            tb_mw -= ep->req.w;
+                            if (tb_mw > w)
+                              {
+                                 w = tb_mw;
+                              }
+			 }
 		       if (w > maxw)
 			 {
 			    maxw = w;
@@ -2210,10 +2221,6 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
 			    pep = ep;
 			    didw = 1;
 			 }
-		       if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
-			 {
-			    /* FIXME: do something */
-			 }
 		    }
 		  if (!ep->chosen_description->fixed.h)
 		    {