Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_editable.c e_entry.c
Log Message:
* [Entry] Fix the blinking of the cursor
* [Entry] Support Copy/Cut. Paste will come later
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_editable.c 19 Aug 2006 20:29:02 -0000 1.7
+++ e_editable.c 20 Aug 2006 09:48:13 -0000 1.8
@@ -485,7 +485,11 @@
return;
sd->cursor_visible = 1;
- evas_object_show(sd->cursor_object);
+ if (evas_object_visible_get(editable))
+ {
+ evas_object_show(sd->cursor_object);
+ edje_object_signal_emit(sd->cursor_object, "cursor_show", "");
+ }
}
/**
@@ -922,8 +926,11 @@
}
}
- if (sd->cursor_visible)
- evas_object_show(sd->cursor_object);
+ if (sd->cursor_visible && evas_object_visible_get(editable))
+ {
+ evas_object_show(sd->cursor_object);
+ edje_object_signal_emit(sd->cursor_object, "cursor_show", "");
+ }
_e_editable_selection_update(editable);
_e_editable_text_position_update(editable, -1);
@@ -1107,14 +1114,17 @@
evas_object_smart_member_add(sd->event_object, object);
sd->text_object = edje_object_add(evas);
+ evas_object_pass_events_set(sd->text_object, 1);
evas_object_clip_set(sd->text_object, sd->clip_object);
evas_object_smart_member_add(sd->text_object, object);
sd->selection_object = edje_object_add(evas);
+ evas_object_pass_events_set(sd->selection_object, 1);
evas_object_clip_set(sd->selection_object, sd->clip_object);
evas_object_smart_member_add(sd->selection_object, object);
sd->cursor_object = edje_object_add(evas);
+ evas_object_pass_events_set(sd->cursor_object, 1);
evas_object_clip_set(sd->cursor_object, sd->clip_object);
evas_object_smart_member_add(sd->cursor_object, object);
@@ -1200,7 +1210,10 @@
evas_object_show(sd->text_object);
if (sd->cursor_visible)
- evas_object_show(sd->cursor_object);
+ {
+ evas_object_show(sd->cursor_object);
+ edje_object_signal_emit(sd->cursor_object, "cursor_show", "");
+ }
if ((sd->selection_visible) && (sd->cursor_pos != sd->selection_pos))
evas_object_show(sd->selection_object);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_entry.c 19 Aug 2006 20:29:02 -0000 1.24
+++ e_entry.c 20 Aug 2006 09:48:13 -0000 1.25
@@ -283,6 +283,7 @@
int selecting;
int changed = 0;
char *range;
+ E_Win *win;
if ((!obj) || (!(sd = evas_object_smart_data_get(obj))))
return;
@@ -379,7 +380,10 @@
range = e_editable_text_range_get(editable, start_pos,
end_pos);
if (range)
{
- //ecore_x_selection_clipboard_set();
+ if ((win = e_win_evas_object_win_get(obj)))
+ ecore_x_selection_clipboard_set(win->evas_win,
+ range,
+ strlen(range) + 1);
free(range);
}
if ((sd->enabled) && (strcmp(event->keyname, "x") == 0))
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
