diff options
author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-12-09 21:51:02 +0100 |
---|---|---|
committer | Cedric BAIL <cedric.bail@free.fr> | 2019-12-13 09:33:05 -0800 |
commit | 7d1463124ac139f3cb99028ff453041a5453ef8f (patch) | |
tree | e0e7870625de5fbf52760f3803d195c45c375620 | |
parent | 4982da63273f60bc3e5a114ee407e9fbd166dd75 (diff) |
efl_ui_widget: do not execute up handler when on destruction
otherwise we would cause an error.
Reviewed-by: Cedric BAIL <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D10846
-rw-r--r-- | src/lib/elementary/efl_ui_widget.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 010c9fa9b6..768d934fae 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c | |||
@@ -691,7 +691,8 @@ _obj_mouse_up(void *data, | |||
691 | Evas_Event_Mouse_Up *ev = event_info; | 691 | Evas_Event_Mouse_Up *ev = event_info; |
692 | 692 | ||
693 | if (sd->still_in && (ev->flags == EVAS_BUTTON_NONE) && | 693 | if (sd->still_in && (ev->flags == EVAS_BUTTON_NONE) && |
694 | (sd->focus_move_policy == ELM_FOCUS_MOVE_POLICY_CLICK)) | 694 | (sd->focus_move_policy == ELM_FOCUS_MOVE_POLICY_CLICK) && |
695 | !efl_invalidated_get(data)) | ||
695 | elm_widget_focus_mouse_up_handle(evas_object_widget_parent_find(obj)); | 696 | elm_widget_focus_mouse_up_handle(evas_object_widget_parent_find(obj)); |
696 | 697 | ||
697 | sd->still_in = EINA_FALSE; | 698 | sd->still_in = EINA_FALSE; |
@@ -704,7 +705,8 @@ _obj_mouse_in(void *data, | |||
704 | void *event_info EINA_UNUSED) | 705 | void *event_info EINA_UNUSED) |
705 | { | 706 | { |
706 | ELM_WIDGET_DATA_GET(data, sd); | 707 | ELM_WIDGET_DATA_GET(data, sd); |
707 | if (sd->focus_move_policy == ELM_FOCUS_MOVE_POLICY_IN) | 708 | if (sd->focus_move_policy == ELM_FOCUS_MOVE_POLICY_IN && |
709 | !efl_invalidated_get(data)) | ||
708 | elm_widget_focus_mouse_up_handle(evas_object_widget_parent_find(obj)); | 710 | elm_widget_focus_mouse_up_handle(evas_object_widget_parent_find(obj)); |
709 | } | 711 | } |
710 | 712 | ||