summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Williams <andy@andywilliams.me>2017-12-13 22:44:10 +0000
committerAndy Williams <andy@andywilliams.me>2018-02-10 22:00:47 +0000
commitc41f5832e4341ce4627519bc20409e3a483e626e (patch)
tree611ad49d417d730d23780e2bf5170bb8b075869c
parentfa73c7b22e150e5df753330bc114477f6106eb4a (diff)
downloadefl-c41f5832e4341ce4627519bc20409e3a483e626e.tar.gz
elm_code: Fix tooltip crash
-rw-r--r--src/lib/elementary/elm_code_widget.c13
-rw-r--r--src/lib/elementary/elm_code_widget_private.h4
2 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index ad3a2df1bd..52db5a84a1 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -388,7 +388,6 @@ _elm_code_widget_fill_line(Elm_Code_Widget *widget, Elm_Code_Line *line)
if (line->number < elm_code_file_lines_get(line->file))
_elm_code_widget_fill_whitespace(widget, '\n', &cells[length + gutter]);
- elm_object_tooltip_text_set(grid, line->status_text);
evas_object_textgrid_update_add(grid, 0, 0, w, 1);
}
@@ -1113,7 +1112,17 @@ _elm_code_widget_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
_elm_code_widget_position_at_coordinates_get(widget, pd, event->cur.canvas.x, event->cur.canvas.y, &row, &col);
if (!pd->editable || !event->buttons)
- return;
+ {
+ Elm_Code_Line *line;
+
+ line = elm_code_file_line_get(elm_code_widget_code_get(widget)->file, row);
+ if (line)
+ elm_object_tooltip_text_set(widget, line->status_text);
+ else
+ elm_object_tooltip_text_set(widget, NULL);
+
+ return;
+ }
if (!pd->selection)
if (col > 0 && row <= elm_code_file_lines_get(pd->code->file))
diff --git a/src/lib/elementary/elm_code_widget_private.h b/src/lib/elementary/elm_code_widget_private.h
index bef2b088b3..8d2af14dc5 100644
--- a/src/lib/elementary/elm_code_widget_private.h
+++ b/src/lib/elementary/elm_code_widget_private.h
@@ -59,10 +59,6 @@ void _elm_code_widget_backspace(Elm_Code_Widget *widget);
void _elm_code_widget_delete(Elm_Code_Widget *widget);
-void _elm_code_widget_tooltip_text_set(Evas_Object *widget, const char *text);
-
-void _elm_code_widget_tooltip_add(Evas_Object *widget);
-
EAPI Elm_Code_Widget_Selection_Data *elm_code_widget_selection_normalized_get(Evas_Object *widget);
void _elm_code_widget_selection_delete_no_undo(Elm_Code_Widget *widget);