Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_textblock.c
Log Message:
see diff. :)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- evas_object_textblock.c 5 Feb 2005 15:53:58 -0000 1.23
+++ evas_object_textblock.c 7 Feb 2005 02:12:36 -0000 1.24
@@ -17,8 +17,8 @@
* * get formatted extents
* * get native extents
* * finish off current api where it is unfinished
- * * if a word (or char) doesnt fit at all do something sensible
* * styles (outline, glow, etxra glow, shadow, soft shadow, etc.)
+ * * if a word (or char) doesnt fit at all do something sensible
* * anchors (to query text extents)
* * tabs (indents)
* * left and right margins
@@ -131,7 +131,7 @@
struct {
unsigned char dirty : 1;
Evas_Coord w, h;
- } native;
+ } native, format;
Evas_List *font_hold;
void *engine_data;
};
@@ -858,6 +858,16 @@
}
static void
+evas_object_textblock_format_calc(Evas_Object *obj)
+{
+ Evas_Object_Textblock *o;
+ Layout layout;
+
+ o = (Evas_Object_Textblock *)(obj->object_data);
+ /* FIXME: takes nodes and produce layotu nodes ignoring object size */
+}
+
+static void
evas_object_textblock_native_calc(Evas_Object *obj)
{
Evas_Object_Textblock *o;
@@ -1427,6 +1437,31 @@
}
void
+evas_object_textblock_format_size_get(Evas_Object *obj, Evas_Coord *w,
Evas_Coord *h)
+{
+ Evas_Object_Textblock *o;
+
+ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
+ if (w) *w = 0;
+ if (h) *h = 0;
+ return;
+ MAGIC_CHECK_END();
+ o = (Evas_Object_Textblock *)(obj->object_data);
+ MAGIC_CHECK(o, Evas_Object_Textblock, MAGIC_OBJ_TEXTBLOCK);
+ if (w) *w = 0;
+ if (h) *h = 0;
+ return;
+ MAGIC_CHECK_END();
+ if (o->native.dirty)
+ {
+ evas_object_textblock_format_calc(obj);
+ o->native.dirty = 0;
+ }
+ if (w) *w = o->format.w;
+ if (h) *h = o->format.h;
+}
+
+void
evas_object_textblock_native_size_get(Evas_Object *obj, Evas_Coord *w,
Evas_Coord *h)
{
Evas_Object_Textblock *o;
-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
