Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart/src/lib/esmart_textarea
Modified Files:
esmart_textarea_cursor.c esmart_textarea_private.c
esmart_textarea_smart.c
Log Message:
various layer to stack conversions, better that way. thanks raster!
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/esmart_textarea_cursor.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- esmart_textarea_cursor.c 29 Mar 2005 20:39:41 -0000 1.1
+++ esmart_textarea_cursor.c 31 Mar 2005 09:23:21 -0000 1.2
@@ -143,12 +143,11 @@
/* override the default cursor */
void
_esmart_textarea_cursor_set(Esmart_Text_Area *t, Evas_Object *o) {
- int x,y,w,h,l;
+ int x,y,w,h;
evas_object_geometry_get(t->cursor, &x,&y,&w,&h);
- l = evas_object_layer_get(t->cursor);
evas_object_del(t->cursor);
t->cursor = o;
evas_object_move(t->cursor, x, y);
- evas_object_layer_set(t->cursor, l);
+ evas_object_stack_above(t->cursor, t->text);
evas_object_show(t->cursor);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/esmart_textarea_private.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- esmart_textarea_private.c 30 Mar 2005 22:45:36 -0000 1.3
+++ esmart_textarea_private.c 31 Mar 2005 09:23:21 -0000 1.4
@@ -32,7 +32,6 @@
evas_object_textblock_char_pos_get(t->text, 1,&x,&y,&w,&h);
//evas_object_textblock_text_del(t->text, 1); // is this needed?
evas_object_textblock_cursor_pos_set(t->text, 0);
- evas_object_layer_set(t->text, 2);
evas_object_focus_set(t->text, 1);
evas_object_event_callback_add(t->text, EVAS_CALLBACK_KEY_DOWN,
@@ -46,13 +45,13 @@
t->bg = evas_object_rectangle_add(evas);
evas_object_color_set(t->bg, 255, 255, 255, 255);
- evas_object_layer_set(t->bg, 1);
+ evas_object_stack_below(t->bg, t->text);
t->cursor = evas_object_rectangle_add(evas);
evas_object_color_set(t->cursor, 0,0,0,255);
if( h > 1000) h = 10;
evas_object_resize(t->cursor, 1, h);
- evas_object_layer_set(t->cursor, 2);
+ evas_object_stack_above(t->cursor, t->text);
return t;
}
@@ -68,14 +67,13 @@
void
_esmart_textarea_bg_set(Esmart_Text_Area *t, Evas_Object *o)
{
- int x,y,w,h,l;
+ int x,y,w,h;
evas_object_geometry_get(t->text, &x,&y,&w,&h);
- l = evas_object_layer_get(t->text);
evas_object_del(t->bg);
t->bg = o;
evas_object_move(t->bg, x, y);
evas_object_resize(t->bg, w, h);
- evas_object_layer_set(t->bg, l - 1);
+ evas_object_stack_below(t->bg, t->text);
evas_object_show(t->bg);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/esmart/src/lib/esmart_textarea/esmart_textarea_smart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- esmart_textarea_smart.c 31 Mar 2005 08:57:09 -0000 1.2
+++ esmart_textarea_smart.c 31 Mar 2005 09:23:21 -0000 1.3
@@ -55,9 +55,9 @@
Esmart_Text_Area *t;
t = evas_object_smart_data_get(o);
- evas_object_layer_set(t->text, l + 1);
- evas_object_layer_set(t->bg, l);
- evas_object_layer_set(t->cursor, l + 1);
+ evas_object_layer_set(t->text, l);
+ evas_object_stack_below(t->bg, t->text);
+ evas_object_stack_above(t->cursor, t->text);
}
void
-------------------------------------------------------
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/info/Sentarus/hamr30
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
