Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src
Modified Files:
etox.c
Log Message:
Strip out \r's that were causing layout issues.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- etox.c 17 Feb 2004 21:58:20 -0000 1.69
+++ etox.c 28 Feb 2004 07:14:57 -0000 1.70
@@ -1089,14 +1089,14 @@
/*
* Make a bit for the preceding text
*/
- bit =
- estyle_new(et->evas, text, et->context->style);
+ bit = estyle_new(et->evas, text, et->context->style);
evas_object_smart_member_add(bit, et->smart_obj);
evas_object_clip_set(bit, et->clip);
evas_object_color_set(bit, et->context->r,
- et->context->g, et->context->b,
- et->context->a);
- estyle_set_font(bit, et->context->font,
et->context->font_size);
+ et->context->g, et->context->b,
+ et->context->a);
+ estyle_set_font(bit, et->context->font,
+ et->context->font_size);
etox_line_append(line, bit);
evas_object_show(bit);
@@ -1108,14 +1108,14 @@
* Make a bit for the tab character
*/
*text = '\0';
- bit =
- estyle_new(et->evas, walk, et->context->style);
+ bit = estyle_new(et->evas, walk, et->context->style);
evas_object_smart_member_add(bit, et->smart_obj);
evas_object_color_set(bit, et->context->r,
- et->context->g, et->context->b,
- et->context->a);
+ et->context->g, et->context->b,
+ et->context->a);
evas_object_clip_set(bit, et->clip);
- estyle_set_font(bit, et->context->font,
et->context->font_size);
+ estyle_set_font(bit, et->context->font,
+ et->context->font_size);
etox_line_append(line, bit);
evas_object_show(bit);
*text = t;
@@ -1128,6 +1128,8 @@
* list of lines.
*/
case '\n':
+ case '\r':
+ t = *walk;
*walk = '\0';
/*
@@ -1144,8 +1146,11 @@
etox_line_append(line, bit);
evas_object_show(bit);
- *walk = '\n';
- text = walk + 1;
+ *walk = t;
+ if (*walk == '\r')
+ text = walk + 2;
+ else
+ text = walk + 1;
/*
* Create a new line for the next text
@@ -1157,6 +1162,8 @@
line->et = et;
break;
+ default:
+ break;
}
walk++;
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
