vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

autosuggest: Refactor suggest list show function 

Summary:
1. Fix wrong location of suggest list
2. Remove duplicated function
3. Add return condition

Reviewers: ajwillia.ms

Reviewed By: ajwillia.ms

Differential Revision: https://phab.enlightenment.org/D4918
This commit is contained in:
YeongJong Lee 2017-05-28 18:58:55 +01:00 committed by Andy Williams
parent eaa3781e52
commit 6239499fed
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/editor/edi_editor.c
View File

@ -421,7 +421,7 @@ static void
_suggest_popup_show(Edi_Editor *editor)
{
unsigned int col, row;
Evas_Coord cx, cy, cw, ch, sy, sh, ey, eh, bg_x, bg_y;
Evas_Coord cx, cy, cw, ch, sh, eh, bg_x, bg_y;
char *word;
if (!editor->suggest_genlist)
@ -430,28 +430,26 @@ _suggest_popup_show(Edi_Editor *editor)
if (elm_genlist_items_count(editor->suggest_genlist) <= 0)
return;
if (evas_object_visible_get(editor->suggest_bg))
return;
elm_code_widget_cursor_position_get(editor->entry, &row, &col);
elm_code_widget_geometry_for_position_get(editor->entry, row, col,
&cx, &cy, &cw, &ch);
evas_object_geometry_get(editor->suggest_bg, NULL, NULL, NULL, &sh);
evas_object_geometry_get(elm_object_top_widget_get(editor->entry),
NULL, NULL, NULL, &eh);
word = _edi_editor_current_word_get(editor, row, col);
bg_x = cx - (strlen(word) + 1) * cw;
bg_y = cy + ch;
if (bg_y + sh > eh)
bg_y = cy - sh;
evas_object_move(editor->suggest_bg, bg_x, bg_y);
evas_object_show(editor->suggest_bg);
evas_object_geometry_get(editor->suggest_bg, NULL, &sy, NULL, &sh);
evas_object_geometry_get(editor->entry, NULL, &ey, NULL, &eh);
if (sy + sh > ey + eh)
{
bg_y = cy - sh;
evas_object_move(editor->suggest_bg, bg_x, bg_y);
}
if (!evas_object_key_grab(editor->suggest_genlist, "Return", 0, 0, EINA_TRUE))
ERR("Failed to grab key - %s", "Return");
if (!evas_object_key_grab(editor->suggest_genlist, "Up", 0, 0, EINA_TRUE))