Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_font_dir.c evas_object_text.c evas_object_textblock.c
Log Message:
rehinting works on the fly now
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_font_dir.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_font_dir.c 28 Feb 2006 04:07:47 -0000 1.14
+++ evas_font_dir.c 1 Mar 2006 03:48:02 -0000 1.15
@@ -318,6 +318,12 @@
return font;
}
+void
+evas_font_load_hinting_set(Evas *evas, void *font, int hinting)
+{
+ evas->engine.func->font_hinting_set(evas->engine.data.output, font,
+ hinting);
+}
/* private stuff */
static Evas_Bool
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- evas_object_text.c 28 Feb 2006 04:07:47 -0000 1.53
+++ evas_object_text.c 1 Mar 2006 03:48:02 -0000 1.54
@@ -969,15 +969,52 @@
return e->font_path;
}
-static Evas_Font_Hinting_Flags _evas_hinting = EVAS_FONT_HINTING_BYTECODE;
+static void
+evas_font_object_rehint(Evas_Object *obj)
+{
+ if (obj->smart.smart)
+ {
+ Evas_Object_List *l3;
+
+ for (l3 = obj->smart.contained; l3; l3 = l3->next)
+ {
+ obj = (Evas_Object *)l3;
+ evas_font_object_rehint(obj);
+ }
+ }
+ else
+ {
+ if (!strcmp(obj->type, "text"))
+ _evas_object_text_rehint(obj);
+ if (!strcmp(obj->type, "textblock"))
+ _evas_object_textblock_rehint(obj);
+ }
+}
EAPI void
evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting)
{
+ Evas_Object_List *l;
+
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
+ if (e->hinting == hinting) return;
e->hinting = hinting;
+ for (l = (Evas_Object_List *)e->layers; l; l = l->next)
+ {
+ Evas_Object_List *l2;
+ Evas_Layer *lay;
+
+ lay = (Evas_Layer *)l;
+ for (l2 = (Evas_Object_List *)lay->objects; l2; l2 = l2->next)
+ {
+ Evas_Object *obj;
+
+ obj = (Evas_Object *)l2;
+ evas_font_object_rehint(obj);
+ }
+ }
}
EAPI Evas_Font_Hinting_Flags
@@ -1558,3 +1595,56 @@
o = (Evas_Object_Text *)(obj->object_data);
return 0;
}
+
+void
+_evas_object_text_rehint(Evas_Object *obj)
+{
+ Evas_Object_Text *o;
+ int is, was;
+
+ o = (Evas_Object_Text *)(obj->object_data);
+ if (!o->engine_data) return;
+ evas_font_load_hinting_set(obj->layer->evas, o->engine_data,
+ obj->layer->evas->hinting);
+ was = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
+ /* DO II */
+ o->prev.text = NULL;
+ if ((o->engine_data) && (o->cur.text))
+ {
+ int w, h;
+ int l = 0, r = 0, t = 0, b = 0;
+
+ ENFN->font_string_size_get(ENDT,
+ o->engine_data,
+ o->cur.text,
+ &w, &h);
+ evas_text_style_pad_get(o->cur.style, &l, &r, &t, &b);
+ obj->cur.geometry.w = w + l + r;
+ obj->cur.geometry.h = h + t + b;
+ obj->cur.cache.geometry.validity = 0;
+ }
+ else
+ {
+ int t = 0, b = 0;
+
+ evas_text_style_pad_get(o->cur.style, NULL, NULL, &t, &b);
+ obj->cur.geometry.w = 0;
+ obj->cur.geometry.h = o->max_ascent + o->max_descent + t + b;
+ obj->cur.cache.geometry.validity = 0;
+ }
+ o->changed = 1;
+ evas_object_change(obj);
+ evas_object_coords_recalc(obj);
+ is = evas_object_is_in_output_rect(obj,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y, 1, 1);
+ if ((is || was) && obj->cur.visible)
+ evas_event_feed_mouse_move(obj->layer->evas,
+ obj->layer->evas->pointer.x,
+ obj->layer->evas->pointer.y,
+ obj->layer->evas->last_timestamp,
+ NULL);
+ evas_object_inform_call_resize(obj);
+}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- evas_object_textblock.c 19 Jan 2006 14:16:47 -0000 1.125
+++ evas_object_textblock.c 1 Mar 2006 03:48:02 -0000 1.126
@@ -4522,3 +4522,32 @@
o->changed = 1;
}
}
+
+void
+_evas_object_textblock_rehint(Evas_Object *obj)
+{
+ Evas_Object_Textblock *o;
+ Evas_Object_List *l, *ll;
+
+ o = (Evas_Object_Textblock *)(obj->object_data);
+ for (l = (Evas_Object_List *)o->lines; l; l = l->next)
+ {
+ Evas_Object_Textblock_Line *ln;
+
+ ln = (Evas_Object_Textblock_Line *)l;
+ for (ll = (Evas_Object_List *)ln->items; ll; ll = ll->next)
+ {
+ Evas_Object_Textblock_Item *it;
+
+ it = (Evas_Object_Textblock_Item *)ll;
+ if (it->format->font.font)
+ evas_font_load_hinting_set(obj->layer->evas,
+ it->format->font.font,
+ obj->layer->evas->hinting);
+ }
+ }
+ o->formatted.valid = 0;
+ o->native.valid = 0;
+ o->changed = 1;
+ evas_object_change(obj);
+}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs