jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=c86aa0dac6431d85feff32f677a79e07a1382b56
commit c86aa0dac6431d85feff32f677a79e07a1382b56
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date: Mon Feb 29 18:14:26 2016 +0900
Revert "edc_editor: optimize bracket logic."
This reverts commit 7250db0b1091d5f792a8586f36aeff92cffb82d1.
This commit causes unexpected cursor movement.
---
src/lib/edc_editor.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 5c01bfd..059d350 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -44,8 +44,8 @@ struct editor_s
struct {
int prev_left;
int prev_right;
- int left; //-1: cancel bracket, -2: don't apply bracket.
- int right; //-1: cancel bracket, -2: don't apply bracket.
+ int left;
+ int right;
} bracket;
Ecore_Timer *syntax_color_timer;
@@ -213,9 +213,6 @@ error_highlight(edit_data *ed, Evas_Object *tb)
static void
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_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_textblock_cursor_free(cur1);
-
- if (ed->bracket.left == -1) ed->bracket.left = -2;
- if (ed->bracket.right == -1) ed->bracket.right = -2;
}
static void
@@ -388,7 +382,7 @@ bracket_update(edit_data *ed)
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
ed->bracket.left = -1;
@@ -1409,10 +1403,10 @@ edit_init(Evas_Object *enventor)
ed->pd = pd;
ed->sh = sh;
ed->error_line = -1;
- ed->bracket.prev_left = -2;
- ed->bracket.prev_right = -2;
- ed->bracket.left = -2;
- ed->bracket.right = -2;
+ ed->bracket.prev_left = -1;
+ ed->bracket.prev_right = -1;
+ ed->bracket.left = -1;
+ ed->bracket.right = -1;
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, key_down_cb, ed);
ecore_event_handler_add(ECORE_EVENT_KEY_UP, key_up_cb, ed);
--
