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

Merge Andy's fix

This commit is contained in:
Al Poole 2017-09-21 14:16:06 +01:00
parent 2e045c0a43 add0d7f6c4
commit d85bc57a49
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,7 +576,7 @@ _suggest_popup_setup(Edi_Editor *editor)
} }
static void static void
_edi_editor_snippet_insert(Edi_Editor *editor, Evas_Event_Key_Down *ev) _edi_editor_snippet_insert(Edi_Editor *editor)
{ {
char *key; char *key;
const char *snippet; const char *snippet;
@ -595,8 +595,6 @@ _edi_editor_snippet_insert(Edi_Editor *editor, Evas_Event_Key_Down *ev)
elm_code_widget_selection_delete(editor->entry); elm_code_widget_selection_delete(editor->entry);
elm_code_widget_text_at_cursor_insert(editor->entry, snippet); elm_code_widget_text_at_cursor_insert(editor->entry, snippet);
if (ev)
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
free(key); free(key);
return; return;
} }
@ -656,7 +654,7 @@ _suggest_hint_click_snippet(void *data, Evas_Object *obj EINA_UNUSED,
Edi_Editor *editor = data; Edi_Editor *editor = data;
_suggest_hint_hide(editor); _suggest_hint_hide(editor);
_edi_editor_snippet_insert(editor, NULL); _edi_editor_snippet_insert(editor);
} }
static void static void
@ -815,12 +813,18 @@ _smart_cb_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
snippet = provider->snippet_get(word); snippet = provider->snippet_get(word);
if (snippet) if (snippet)
_edi_editor_snippet_insert(editor, ev); {
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
_edi_editor_snippet_insert(editor);
}
else if (strlen(word) >= 3) else if (strlen(word) >= 3)
{ {
suggest = _suggest_match_get(editor, word); suggest = _suggest_match_get(editor, word);
if (suggest) if (suggest)
_suggest_list_selection_insert(editor, suggest->summary); {
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
_suggest_list_selection_insert(editor, suggest->summary);
}
} }
free(word); free(word);