On Sun, 9 Feb 2014 10:29:30 +0900 (KST) ChunEon Park <her...@naver.com> said:
where did you get a crash? > eeeek. > > this caused crash. > > please be sure titr->text_props.font_instance is valid always. > > ------------------------------------ > -Regards, Hermet- > -----Original Message----- > From: "Carsten Haitzler"<ras...@rasterman.com> > To: <g...@lists.enlightenment.org>; > Cc: > Sent: 2014-02-08 (토) 22:58:39 > Subject: [EGIT] [core/efl] master 01/01: evas - textblock ... fix valign > handling to actually work as documented > > raster pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=229ee74f6c6637a369d46b771642cb91a3c34409 > > commit 229ee74f6c6637a369d46b771642cb91a3c34409 > Author: Carsten Haitzler (Rasterman) <raster>@rasterman.com> > Date: Sat Feb 8 22:54:56 2014 +0900 > > evas - textblock ... fix valign handling to actually work as documented > > valign handling was really broken. this fixes it to pretty much work > again. ie 0.0 == top, 0.5 == centered, 1.0 == bottom align and -1.0 > == baseline. only baseline worked before. > --- > src/lib/evas/canvas/evas_object_textblock.c 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/src/lib/evas/canvas/evas_object_textblock.c > b/src/lib/evas/canvas/evas_object_textblock.c index f62370d..c717ac4 100644 > --- a/src/lib/evas/canvas/evas_object_textblock.c > +++ b/src/lib/evas/canvas/evas_object_textblock.c > @@ -10743,7 +10743,15 @@ evas_object_textblock_render(Evas_Object *eo_obj > EINA_UNUSED, yoff = ln->baseline; \ > if (itr->format->valign != -1.0) \ > { \ > - yoff += itr->format->valign * (ln->h - itr->h); \ > + if (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) \ > + { \ > + Evas_Object_Textblock_Text_Item *titr = \ > + (Evas_Object_Textblock_Text_Item *)itr; \ > + yoff = \ > + evas_common_font_instance_max_ascent_get > (titr->text_props.font_instance) +\ > + (itr->format->valign * (ln->h - itr->h)); \ > + } \ > + else yoff = itr->format->valign * (ln->h - itr->h); \ > } \ > itr->yoff = yoff; \ > if (clip) \ > > -- > > > > ------------------------------------------------------------------------------ > Managing the Performance of Cloud-Based Applications > Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. > Read the Whitepaper. > http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ras...@rasterman.com ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
