forked from enlightenment/efl
Edje size_min_restricted_calc: Hopefully fixed textblock handling.
SVN revision: 59010
This commit is contained in:
parent
5570891eb3
commit
31d4f2699b
|
@ -80,3 +80,7 @@
|
||||||
* Add Feature: Support explicit shadow direction with extra effect
|
* Add Feature: Support explicit shadow direction with extra effect
|
||||||
param (optional). Default as before.
|
param (optional). Default as before.
|
||||||
|
|
||||||
|
2011-04-28 Tom Hacohen (TAsn)
|
||||||
|
|
||||||
|
* size_min_restricted_calc: Fixed textblock handling.
|
||||||
|
|
||||||
|
|
|
@ -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->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)
|
if (w > maxw)
|
||||||
{
|
{
|
||||||
maxw = w;
|
maxw = w;
|
||||||
|
@ -2210,10 +2221,6 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
|
||||||
pep = ep;
|
pep = ep;
|
||||||
didw = 1;
|
didw = 1;
|
||||||
}
|
}
|
||||||
if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK))
|
|
||||||
{
|
|
||||||
/* FIXME: do something */
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (!ep->chosen_description->fixed.h)
|
if (!ep->chosen_description->fixed.h)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue