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:
tb2 work
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- evas_object_textblock.c 2 Sep 2005 15:27:09 -0000 1.89
+++ evas_object_textblock.c 4 Sep 2005 11:34:03 -0000 1.90
@@ -3163,7 +3163,7 @@
Evas_Object_Textblock *o;
Evas_Object_List *l, *ll;
Evas_Object_Textblock_Line *ln = NULL;
- Evas_Object_Textblock_Item *it = NULL;
+ Evas_Object_Textblock_Item *it = NULL, *it_break = NULL;
Evas_Object_Textblock_Format_Item *fi = NULL;
if (!cur) return 0;
@@ -3180,7 +3180,11 @@
for (ll = (Evas_Object_List *)ln->items; ll; ll = ll->next)
{
it = (Evas_Object_Textblock_Item *)ll;
- if ((it->x +ln->x) > x) break;
+ if ((it->x +ln->x) > x)
+ {
+ it_break = it;
+ break;
+ }
if (((it->x + ln->x) <= x) && (((it->x + ln->x) + it->w) > x))
{
int pos;
@@ -3209,6 +3213,13 @@
return 1;
}
}
+ if (it_break)
+ {
+ it = it_break;
+ cur->pos = it->source_pos;
+ cur->node = it->source_node;
+ return 1;
+ }
}
}
return 0;
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
