more bug --

SVN revision: 47202
This commit is contained in:
Carsten Haitzler 2010-03-14 12:24:54 +00:00
parent 2a78f7724c
commit 6e66ed5a65
1 changed files with 17 additions and 5 deletions

View File

@ -1202,6 +1202,9 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
{
if (multiline)
{
if (en->have_selection)
_range_del(en->cursor, rp->object, en);
_sel_clear(en->cursor, rp->object, en);
evas_textblock_cursor_format_prepend(en->cursor, "\n");
_curs_update_from_curs(en->cursor, rp->object, en);
_anchors_get(en->cursor, rp->object, en);
@ -1218,8 +1221,8 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
{
if (en->have_selection)
_range_del(en->cursor, rp->object, en);
evas_textblock_cursor_text_prepend(en->cursor, ev->string);
_sel_clear(en->cursor, rp->object, en);
evas_textblock_cursor_text_prepend(en->cursor, ev->string);
_curs_update_from_curs(en->cursor, rp->object, en);
_anchors_get(en->cursor, rp->object, en);
_edje_emit(ed, "entry,changed", rp->part->name);
@ -1323,11 +1326,20 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
_curs_end(en->cursor, rp->object, en);
else
{
evas_textblock_cursor_line_geometry_get(en->cursor, &lx, &ly, &lw, &lh);
if (en->cx <= lx)
_curs_lin_start(en->cursor, rp->object, en);
int lnum;
lnum = evas_textblock_cursor_line_geometry_get(en->cursor, &lx, &ly, &lw, &lh);
if (lnum < 0)
{
_curs_lin_start(en->cursor, rp->object, en);
}
else
_curs_lin_end(en->cursor, rp->object, en);
{
if (en->cx <= lx)
_curs_lin_start(en->cursor, rp->object, en);
else
_curs_lin_end(en->cursor, rp->object, en);
}
}
line = evas_textblock_cursor_line_geometry_get(en->cursor, &lx, &ly, &lw, &lh);
}