NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm_code_widget: keep track of visibility. 

Keep track of visibility and ensure the cursor can never be
filled when hidden. This should finally end any issue with the
cursor and visibility with the new focus system. Didn't see this
previously until working on Edi's bottom panes which caused redraw
on resize of the widgets.

@fix
This commit is contained in:
Al Poole 2017-11-09 00:38:51 +00:00
parent c2fe37a46d
commit e63e2d7e21
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/elementary/elm_code_widget.c
View File

@ -270,7 +270,7 @@ _elm_code_widget_fill_cursor(Elm_Code_Widget *widget, unsigned int number, int g
pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
if (pd->editable && pd->focussed && pd->cursor_line == number)
if (pd->visible && pd->editable && pd->focussed && pd->cursor_line == number)
{
if (pd->cursor_col + gutter - 1 >= (unsigned int) w)
return;
@ -564,6 +564,7 @@ _elm_code_widget_show_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
pd->visible = EINA_TRUE;
if (pd->cursor_rect)
evas_object_show(pd->cursor_rect);
}
@ -577,6 +578,7 @@ _elm_code_widget_hidden_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
pd->visible = EINA_FALSE;
if (pd->cursor_rect)
evas_object_hide(pd->cursor_rect);
}

2
src/lib/elementary/elm_code_widget_private.h
View File

@ -24,7 +24,7 @@ typedef struct
unsigned int cursor_line, cursor_col;
Evas_Object *cursor_rect;
Eina_Bool editable, focussed;
Eina_Bool visible, editable, focussed;
Eina_Bool show_line_numbers;
unsigned int line_width_marker, tabstop;
Eina_Bool show_whitespace, tab_inserts_spaces;