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

Revert "edc_editor: optimize bracket logic." 

This reverts commit 7250db0b10.

This commit causes unexpected cursor movement.
This commit is contained in:
Jaehyun Cho 2016-02-29 18:14:26 +09:00
parent 01431db641
commit c86aa0dac6
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/edc_editor.c
View File

@ -44,8 +44,8 @@ struct editor_s
struct { struct {
int prev_left; int prev_left;
int prev_right; int prev_right;
int left; //-1: cancel bracket, -2: don't apply bracket. int left;
int right; //-1: cancel bracket, -2: don't apply bracket. int right;
} bracket; } bracket;
Ecore_Timer *syntax_color_timer; Ecore_Timer *syntax_color_timer;
@ -213,9 +213,6 @@ error_highlight(edit_data *ed, Evas_Object *tb)
static void static void
bracket_highlight(edit_data *ed, Evas_Object *tb) bracket_highlight(edit_data *ed, Evas_Object *tb)
{ {
if ((ed->bracket.left == -2) && (ed->bracket.right == -2))
return;
Evas_Textblock_Cursor *cur1 = evas_object_textblock_cursor_new(tb); Evas_Textblock_Cursor *cur1 = evas_object_textblock_cursor_new(tb);
evas_textblock_cursor_pos_set(cur1, ed->bracket.left); evas_textblock_cursor_pos_set(cur1, ed->bracket.left);
@ -229,9 +226,6 @@ bracket_highlight(edit_data *ed, Evas_Object *tb)
evas_object_textblock_text_markup_prepend(cur1, "</hilight>"); evas_object_textblock_text_markup_prepend(cur1, "</hilight>");
evas_textblock_cursor_free(cur1); evas_textblock_cursor_free(cur1);
if (ed->bracket.left == -1) ed->bracket.left = -2;
if (ed->bracket.right == -1) ed->bracket.right = -2;
} }
static void static void
@ -388,7 +382,7 @@ bracket_update(edit_data *ed)
if (ch1 != '{' && ch1 != '}' && ch2 != '{' && ch2 != '}') if (ch1 != '{' && ch1 != '}' && ch2 != '{' && ch2 != '}')
{ {
if ((ed->bracket.prev_left > -1) && (ed->bracket.prev_right > -1)) if (ed->bracket.prev_left != -1 && ed->bracket.prev_right != -1)
{ {
//initialize bracket //initialize bracket
ed->bracket.left = -1; ed->bracket.left = -1;
@ -1409,10 +1403,10 @@ edit_init(Evas_Object *enventor)
ed->pd = pd; ed->pd = pd;
ed->sh = sh; ed->sh = sh;
ed->error_line = -1; ed->error_line = -1;
ed->bracket.prev_left = -2; ed->bracket.prev_left = -1;
ed->bracket.prev_right = -2; ed->bracket.prev_right = -1;
ed->bracket.left = -2; ed->bracket.left = -1;
ed->bracket.right = -2; ed->bracket.right = -1;
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, key_down_cb, ed); ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, key_down_cb, ed);
ecore_event_handler_add(ECORE_EVENT_KEY_UP, key_up_cb, ed); ecore_event_handler_add(ECORE_EVENT_KEY_UP, key_up_cb, ed);