From: Christopher M. <cpm...@co...> - 2008-09-10 07:14:48
|
fp...better for a scale...more precision dh no-...@en... wrote: > Author: raster > Date: 2008-09-09 23:40:54 -0700 (Tue, 09 Sep 2008) > New Revision: 35924 > > Modified: > trunk/evas/src/lib/canvas/evas_object_text.c trunk/evas/src/lib/canvas/evas_object_textblock.c > Log: > > ensure scaling multiplies are promoted to fp. > > > > Modified: trunk/evas/src/lib/canvas/evas_object_text.c > =================================================================== > --- trunk/evas/src/lib/canvas/evas_object_text.c 2008-09-10 06:40:24 UTC (rev 35923) > +++ trunk/evas/src/lib/canvas/evas_object_text.c 2008-09-10 06:40:54 UTC (rev 35924) > @@ -191,7 +191,6 @@ > evas_font_free(obj->layer->evas, o->engine_data); > o->engine_data = NULL; > } > - o->engine_data = evas_font_load(obj->layer->evas, font, o->cur.source, (int)(((double)size) * obj->cur.scale)); > if (!same_font) > { > if (o->cur.font) evas_stringshare_del(o->cur.font); > @@ -200,6 +199,8 @@ > o->prev.font = NULL; > } > o->cur.size = size; > + o->engine_data = evas_font_load(obj->layer->evas, o->cur.font, o->cur.source, > + (int)(((double)o->cur.size) * obj->cur.scale)); > evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b); > if ((o->engine_data) && (o->cur.text)) > { > > Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c > =================================================================== > --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2008-09-10 06:40:24 UTC (rev 35923) > +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2008-09-10 06:40:54 UTC (rev 35924) > @@ -1168,6 +1168,7 @@ > } > else if (fmt->font.name) > buf = strdup(fmt->font.name); > + > fmt->font.font = evas_font_load(obj->layer->evas, > buf, fmt->font.source, > (int)(((double)fmt->font.size) * obj->cur.scale)); > @@ -1290,7 +1291,7 @@ > else if (fmt2->font.name) > buf = strdup(fmt2->font.name); > fmt2->font.font = evas_font_load(obj->layer->evas, > - buf, fmt2->font.source, > + buf, fmt2->font.source, > (int)(((double)fmt2->font.size) * obj->cur.scale)); > if (buf) free(buf); > return fmt2; > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > enlightenment-svn mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > |