enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

[editor] Show a highlight for the current cursor line

This commit is contained in:
Andy Williams 2015-10-10 12:00:43 -07:00
parent 2b56b1f395
commit d6b9a3f82c
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elm_code/src/lib/elm_code_common.h
View File

@ -11,6 +11,7 @@ EAPI extern const Eo_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE;
typedef enum {
ELM_CODE_STATUS_TYPE_DEFAULT = 0,
ELM_CODE_STATUS_TYPE_CURRENT,
ELM_CODE_STATUS_TYPE_IGNORED,
ELM_CODE_STATUS_TYPE_NOTE,
ELM_CODE_STATUS_TYPE_WARNING,

22
legacy/elm_code/src/lib/widget/elm_code_widget.c
View File

@ -157,14 +157,17 @@ _elm_code_widget_fill_line_token(Evas_Textgrid_Cell *cells, int count, int start
}
static unsigned int
_elm_code_widget_status_type_get(Elm_Code_Widget *widget, Elm_Code_Status_Type set_type, unsigned int col)
_elm_code_widget_status_type_get(Elm_Code_Widget *widget, Elm_Code_Line *line, unsigned int col)
{
Elm_Code_Widget_Data *pd;
pd = eo_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
if (set_type != ELM_CODE_STATUS_TYPE_DEFAULT)
return set_type;
if (line->status != ELM_CODE_STATUS_TYPE_DEFAULT)
return line->status;
if (pd->editable && pd->focussed && pd->cursor_line == line->number)
return ELM_CODE_STATUS_TYPE_CURRENT;
if (pd->line_width_marker == col)
return ELM_CODE_WIDGET_COLOR_GUTTER_BG;
@ -353,7 +356,7 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget, Elm_Code_Line *line)
unichr = eina_unicode_utf8_next_get(chr, &chrpos);
cells[x].codepoint = unichr;
cells[x].bg = _elm_code_widget_status_type_get(widget, line->status, x - gutter + 1);
cells[x].bg = _elm_code_widget_status_type_get(widget, line, x - gutter + 1);
charwidth = 1;
if (unichr == '\t')
@ -361,7 +364,7 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget, Elm_Code_Line *line)
for (i = x + 1; i < x + charwidth; i++)
{
cells[i].codepoint = 0;
cells[i].bg = _elm_code_widget_status_type_get(widget, line->status, i - gutter + 1);
cells[i].bg = _elm_code_widget_status_type_get(widget, line, i - gutter + 1);
}
_elm_code_widget_fill_whitespace(widget, unichr, &cells[x]);
@ -369,7 +372,7 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget, Elm_Code_Line *line)
for (; x < (unsigned int) w; x++)
{
cells[x].codepoint = 0;
cells[x].bg = _elm_code_widget_status_type_get(widget, line->status, x - gutter + 1);
cells[x].bg = _elm_code_widget_status_type_get(widget, line, x - gutter + 1);
}
_elm_code_widget_fill_selection(widget, line, cells, gutter, w);
@ -398,7 +401,10 @@ _elm_code_widget_empty_line(Elm_Code_Widget *widget, unsigned int number)
for (x = gutter; x < (unsigned int) w; x++)
{
cells[x].codepoint = 0;
cells[x].bg = _elm_code_widget_status_type_get(widget, ELM_CODE_STATUS_TYPE_DEFAULT, x - gutter + 1);
if (pd->editable && pd->focussed && pd->cursor_line == number)
cells[x].bg = ELM_CODE_STATUS_TYPE_CURRENT;
else
cells[x].bg = ELM_CODE_STATUS_TYPE_DEFAULT;
}
_elm_code_widget_fill_cursor(widget, number, cells, gutter, w);
@ -1456,6 +1462,8 @@ _elm_code_widget_setup_palette(Evas_Object *o)
// setup status colors
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, ELM_CODE_STATUS_TYPE_DEFAULT,
36, 36, 36, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, ELM_CODE_STATUS_TYPE_CURRENT,
12, 12, 12, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, ELM_CODE_STATUS_TYPE_IGNORED,
36, 36, 36, 255);
evas_object_textgrid_palette_set(o, EVAS_TEXTGRID_PALETTE_STANDARD, ELM_CODE_STATUS_TYPE_NOTE,