Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_entry.c ewl_text.c
Log Message:
- create a separate theme for the cursor
- make sure the btree has a starting context
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_entry.c 27 Oct 2005 03:14:07 -0000 1.31
+++ ewl_entry.c 2 Nov 2005 21:41:44 -0000 1.32
@@ -136,17 +136,21 @@
if (e->editable)
{
ewl_callback_append(EWL_WIDGET(e), EWL_CALLBACK_KEY_DOWN,
- ewl_entry_cb_key_down, NULL);
+ ewl_entry_cb_key_down, NULL);
+
if (ewl_object_state_has(EWL_OBJECT(e),
EWL_FLAG_STATE_SELECTED))
ewl_widget_show(e->cursor);
+
ewl_widget_state_set(EWL_WIDGET(e), "editable");
}
else
{
ewl_callback_del(EWL_WIDGET(e), EWL_CALLBACK_KEY_DOWN,
- ewl_entry_cb_key_down);
+ ewl_entry_cb_key_down);
+
if (ewl_object_state_has(EWL_OBJECT(e),
EWL_FLAG_STATE_SELECTED))
ewl_widget_hide(e->cursor);
+
ewl_widget_state_set(EWL_WIDGET(e), "noteditable");
}
@@ -226,8 +230,6 @@
if (!cw) cw = CURRENT_W(e->cursor);
if (!ch) ch = CURRENT_H(e->cursor);
- /* XXX this needs to move over a little so it dosen't sit right on
- * top of the char */
ewl_object_geometry_request(EWL_OBJECT(e->cursor), cx, cy, cw, ch);
DLEAVE_FUNCTION(DLEVEL_STABLE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_text.c 2 Nov 2005 18:23:21 -0000 1.41
+++ ewl_text.c 2 Nov 2005 21:41:44 -0000 1.42
@@ -110,7 +110,11 @@
{
DRETURN_INT(FALSE, DLEVEL_STABLE);
}
- t->current_context = NULL;
+
+ /* create the default context and stick it into the tree */
+ t->current_context = ewl_text_context_default_create(t);
+ t->formatting->tx = t->current_context;
+ t->formatting->tx->ref_count ++;
ewl_callback_append(EWL_WIDGET(t), EWL_CALLBACK_CONFIGURE,
ewl_text_cb_configure, NULL);
@@ -183,7 +187,7 @@
{
if (x) *x = 0;
if (y) *y = 0;
- if (w) *w = 0;
+ if (w) *w = 1;
if (h)
{
if (t->current_context)
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
