Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src
Modified Files:
etox.c etox_line.c etox_obstacle.c etox_selection.c
Log Message:
add the members to the smart object, not the other way around
(this API is a bit un-intuitive...)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- etox.c 16 Aug 2003 06:09:32 -0000 1.56
+++ etox.c 19 Aug 2003 04:00:22 -0000 1.57
@@ -1038,7 +1038,7 @@
*/
bit =
estyle_new(et->evas, text, et->context->style);
- evas_object_smart_member_add(et->smart_obj, bit);
+ 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,
@@ -1057,7 +1057,7 @@
*text = '\0';
bit =
estyle_new(et->evas, walk, et->context->style);
- evas_object_smart_member_add(et->smart_obj, bit);
+ 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);
@@ -1082,7 +1082,7 @@
*/
bit =
estyle_new(et->evas, text, et->context->style);
- evas_object_smart_member_add(et->smart_obj, bit);
+ 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);
@@ -1114,7 +1114,7 @@
*/
if (*text) {
bit = estyle_new(et->evas, text, et->context->style);
- evas_object_smart_member_add(et->smart_obj, bit);
+ 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);
evas_object_clip_set(bit, et->clip);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_line.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- etox_line.c 16 Aug 2003 06:09:32 -0000 1.22
+++ etox_line.c 19 Aug 2003 04:00:23 -0000 1.23
@@ -397,8 +397,8 @@
index = estyle_text_at_position(bit, et->x + et->w, y + (h / 2),
NULL, NULL, NULL, NULL);
- /* if we have an index */
- if (index != -1) {
+ /* if we have an index and there is more than one char on the line */
+ if (index != -1){
char *tmp;
/* don't start a new line with a space */
@@ -415,7 +415,7 @@
/* create a marker bit. */
marker = estyle_new(et->evas, et->context->marker.text,
et->context->marker.style);
- evas_object_smart_member_add(et->smart_obj, marker);
+ evas_object_smart_member_add(marker, et->smart_obj);
evas_object_color_set(marker, et->context->marker.r,
et->context->marker.g,
et->context->marker.b,
@@ -525,6 +525,8 @@
l = prevline->next;
}
+
+// etox_line_minimize(line);
}
Evas_Object *
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_obstacle.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etox_obstacle.c 16 Aug 2003 06:09:32 -0000 1.16
+++ etox_obstacle.c 19 Aug 2003 04:00:23 -0000 1.17
@@ -25,7 +25,7 @@
if (obst) {
obst->et = et;
obst->bit = estyle_new(et->evas, "", NULL);
- evas_object_smart_member_add(et->smart_obj, obst->bit);
+ evas_object_smart_member_add(obst->bit, et->smart_obj);
estyle_fix_geometry(obst->bit, x, y, w, h);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_selection.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etox_selection.c 6 Aug 2003 02:45:36 -0000 1.6
+++ etox_selection.c 19 Aug 2003 04:00:23 -0000 1.7
@@ -46,7 +46,7 @@
*/
if (index && index < estyle_length(bit)) {
point = estyle_split(bit, index);
- evas_object_smart_member_add(line->et->smart_obj, point);
+ evas_object_smart_member_add(point, line->et->smart_obj);
line->bits = evas_list_append_relative(line->bits, point, bit);
l = active_selections;
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
