From 2c0ea5b5e3b9a1b8a00c2b940f3853d21f88e957 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 7 Aug 2019 10:24:08 -0400 Subject: [PATCH] efl_ui_focus_layer: we should cleanup on invalidate Summary: otherwise there will be errors. Lets pray this did not break anything else. Depends on D9518 Reviewers: zmike Reviewed By: zmike Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9521 --- src/lib/elementary/efl_ui_focus_layer.c | 4 ++-- src/lib/elementary/efl_ui_focus_layer.eo | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_layer.c b/src/lib/elementary/efl_ui_focus_layer.c index 6c6c8218c1..ccbe1d31e8 100644 --- a/src/lib/elementary/efl_ui_focus_layer.c +++ b/src/lib/elementary/efl_ui_focus_layer.c @@ -55,10 +55,10 @@ _efl_ui_focus_layer_efl_ui_focus_manager_move(Eo *obj, Efl_Ui_Focus_Layer_Data * } EOLIAN static void -_efl_ui_focus_layer_efl_object_destructor(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED) +_efl_ui_focus_layer_efl_object_invalidate(Eo *obj, Efl_Ui_Focus_Layer_Data *pd EINA_UNUSED) { efl_ui_focus_layer_enable_set(obj, EINA_FALSE); - efl_destructor(efl_super(obj, MY_CLASS)); + efl_invalidate(efl_super(obj, MY_CLASS)); } EOLIAN static Efl_Ui_Focus_Manager* diff --git a/src/lib/elementary/efl_ui_focus_layer.eo b/src/lib/elementary/efl_ui_focus_layer.eo index fd177caf62..4773de3201 100644 --- a/src/lib/elementary/efl_ui_focus_layer.eo +++ b/src/lib/elementary/efl_ui_focus_layer.eo @@ -28,6 +28,6 @@ mixin @beta Efl.Ui.Focus.Layer requires Efl.Ui.Widget extends Efl.Ui.Widget_Focu Efl.Ui.Focus.Object.focus_manager { get; } Efl.Ui.Focus.Object.focus_parent { get; } Efl.Object.constructor; - Efl.Object.destructor; + Efl.Object.invalidate; } }