Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src
Modified Files:
etox.c
Log Message:
Make the delete indices like the rest of etox.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- etox.c 8 Oct 2004 01:13:28 -0000 1.95
+++ etox.c 12 Oct 2004 17:48:18 -0000 1.96
@@ -232,6 +232,7 @@
et->length -= end->length;
et->h -= end->h;
etox_line_merge_append(end, start);
+ etox_line_minimize(end);
etox_line_free(start);
if (lines)
end->length++;
@@ -322,6 +323,7 @@
et->length -= end->length;
et->h -= end->h;
etox_line_merge_prepend(start, end);
+ etox_line_minimize(end);
etox_line_free(start);
if (et->lines->next)
start->length++;
@@ -420,6 +422,8 @@
lines = evas_list_remove(lines, temp);
len = start->length;
etox_line_merge_append(start, temp);
+ etox_line_minimize(start);
+ etox_line_free(temp);
et->length += start->length - len;
if (start->w > et->tw)
et->tw = start->w;
@@ -436,9 +440,11 @@
end = ll->next->data;
len = temp->length;
etox_line_merge_prepend(temp, end);
+ etox_line_minimize(end);
et->length += temp->length - len;
if (end->w > et->tw)
et->tw = end->w;
+ etox_line_free(temp);
}
/*
@@ -486,7 +492,7 @@
bit = etox_line_index_to_bit(start, &index);
etox_line_split(start, bit, index);
- index ++;
+ index++;
idx = etox_index_to_line(et, &index);
if (!idx) return;
@@ -501,12 +507,13 @@
* these +1's are here cuz the etox length seems to be +1 for some
* reason so this just accomidates that
*/
- if (idx->length == len + 1) {
+ if (idx->length == len) {
etox_line_remove(idx, bit);
evas_list_remove(et->lines, idx);
etox_line_free(idx);
- } else if (idx->length > (len + 1)) {
+ }
+ else if (idx->length > len) {
Etox_Line *end = NULL;
Evas_Object *b2;
@@ -514,7 +521,7 @@
b2 = etox_line_index_to_bit(idx, &index);
etox_line_split(idx, b2, index);
- index = orig_index + len + 2;
+ index = orig_index + len + 1;
end = etox_index_to_line(et, &index);
etox_line_merge_append(start, end);
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
