From: Enlightenment S. <no-...@en...> - 2011-06-02 14:02:39
|
Log: Evas textblock: Fixed min size calculation with right aligned paragraphs. Author: tasn Date: 2011-06-02 07:02:31 -0700 (Thu, 02 Jun 2011) New Revision: 59899 Trac: http://trac.enlightenment.org/e/changeset/59899 Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-06-02 10:40:43 UTC (rev 59898) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2011-06-02 14:02:31 UTC (rev 59899) @@ -2479,16 +2479,16 @@ c->ln->x = c->marginl + c->o->style_pad.l; } + c->par->h = c->ln->y + c->ln->h; + if (c->ln->w > c->par->w) + c->par->w = c->ln->w; + { - Evas_Coord new_wmax = c->ln->x + c->ln->w + + Evas_Coord new_wmax = c->par->w + c->marginl + c->marginr - (c->o->style_pad.l + c->o->style_pad.r); if (new_wmax > c->wmax) c->wmax = new_wmax; } - - c->par->h = c->ln->y + c->ln->h; - if (c->ln->w + c->ln->x > c->par->w) - c->par->w = c->ln->x + c->ln->w; } /** |