enlightenment/enventor
enlightenment
/
enventor
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

edc_editor: fix syntax color issue. 

Some cases, the edc editor can't apply syntax color
when it opens a new edc file.

we can cover this scanerio by trying  syntax color logic again
until it's succeed.

@T4275
This commit is contained in:
Hermet Park 2016-08-24 16:40:18 +09:00
parent b87adfb06c
commit 5ea2c05dec
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/edc_editor.c
View File

@ -225,7 +225,7 @@ bracket_highlight(edit_data *ed, Evas_Object *tb)
evas_textblock_cursor_free(cur1); evas_textblock_cursor_free(cur1);
} }
static void static Eina_Bool
syntax_color_apply(edit_data *ed, Eina_Bool partial) syntax_color_apply(edit_data *ed, Eina_Bool partial)
{ {
Evas_Object *tb = elm_entry_textblock_get(ed->en_edit); Evas_Object *tb = elm_entry_textblock_get(ed->en_edit);
@ -240,11 +240,11 @@ syntax_color_apply(edit_data *ed, Eina_Bool partial)
char *utf8 = (char *) color_cancel(NULL, syntax_color_data_get(ed->sh), text, char *utf8 = (char *) color_cancel(NULL, syntax_color_data_get(ed->sh), text,
strlen(text), from_line, to_line, &from, strlen(text), from_line, to_line, &from,
&to); &to);
if (!utf8) return; if (!utf8) return EINA_FALSE;
const char *translated = color_apply(NULL, syntax_color_data_get(ed->sh), const char *translated = color_apply(NULL, syntax_color_data_get(ed->sh),
utf8, strlen(utf8), from, to); utf8, strlen(utf8), from, to);
if (!translated) return; if (!translated) return EINA_FALSE;
/* I'm not sure this will be problem. /* I'm not sure this will be problem.
But it can avoid entry_object_text_escaped_set() in Edje. But it can avoid entry_object_text_escaped_set() in Edje.
@ -255,13 +255,18 @@ syntax_color_apply(edit_data *ed, Eina_Bool partial)
error_highlight(ed, tb); error_highlight(ed, tb);
bracket_highlight(ed, tb); bracket_highlight(ed, tb);
entry_recover(ed, cursor_pos, sel_cur_begin, sel_cur_end); entry_recover(ed, cursor_pos, sel_cur_begin, sel_cur_end);
return EINA_TRUE;
} }
static Eina_Bool static Eina_Bool
syntax_color_timer_cb(void *data) syntax_color_timer_cb(void *data)
{ {
edit_data *ed = data; edit_data *ed = data;
syntax_color_apply(ed, EINA_TRUE); if (!syntax_color_apply(ed, EINA_TRUE))
{
return ECORE_CALLBACK_RENEW;
}
ed->syntax_color_timer = NULL; ed->syntax_color_timer = NULL;
return ECORE_CALLBACK_CANCEL; return ECORE_CALLBACK_CANCEL;
} }