From b3c0da13d80456bcbf3954698413df5ee845b8c2 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Tue, 28 Jan 2020 06:49:46 +0900 Subject: [PATCH] efl_ui_textbox / efl_ui_image_zoomable: remove duplicated code Summary: these implementations were totally equal to what is there in efl_ui_layout. No point in keeping them. (Note, entry_edje is equal to resize_obj) ref T8522 Reviewers: segfaultxavi, cedric, zmike, woohyun Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T8522 Differential Revision: https://phab.enlightenment.org/D11141 --- src/lib/elementary/efl_ui_image_zoomable.c | 28 +------------------ src/lib/elementary/efl_ui_image_zoomable.eo | 3 --- src/lib/elementary/efl_ui_textbox.c | 30 --------------------- src/lib/elementary/efl_ui_textbox.eo | 3 --- 4 files changed, 1 insertion(+), 63 deletions(-) diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 62a146422f..7d4f5d072a 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -1972,32 +1972,6 @@ _efl_ui_image_zoomable_efl_layout_group_group_size_max_get(const Eo *obj EINA_UN return EINA_SIZE2D(0, 0); } -EOLIAN static Eina_Bool -_efl_ui_image_zoomable_efl_layout_signal_signal_callback_add(Eo *obj, Efl_Ui_Image_Zoomable_Data *pd EINA_UNUSED, - const char *emission, const char *source, - void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb) -{ - Eina_Bool ok; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - - ok = efl_layout_signal_callback_add(wd->resize_obj, emission, source, func_data, func, func_free_cb); - - return ok; -} - -EOLIAN static Eina_Bool -_efl_ui_image_zoomable_efl_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Image_Zoomable_Data *pd EINA_UNUSED, - const char *emission, const char *source, - void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb) -{ - Eina_Bool ok; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); - - ok = efl_layout_signal_callback_del(wd->resize_obj, emission, source, func_data, func, func_free_cb); - - return ok; -} - static Eina_Error _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd, Eina_Bool resize) @@ -3040,7 +3014,7 @@ _efl_ui_image_zoomable_animate_cb(void *data) return ECORE_CALLBACK_RENEW; } -static Eina_Bool +static Eina_Bool _efl_ui_image_zoomable_animated_set_internal(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd, Eina_Bool anim) { anim = !!anim; diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo index 4887128503..e27eb82c13 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.eo +++ b/src/lib/elementary/efl_ui_image_zoomable.eo @@ -67,9 +67,6 @@ class Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom Efl.Gfx.Image_Orientable.image_orientation { get; set; } Efl.Layout.Group.group_size_min { get; } Efl.Layout.Group.group_size_max { get; } - Efl.Layout.Signal.signal_callback_add; - Efl.Layout.Signal.signal_callback_del; - //Efl.Canvas.Layout_Group.group_data { get; } } events { press: void; [[Called when photocam got pressed]] diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c index 72e692c3e8..0976e81616 100644 --- a/src/lib/elementary/efl_ui_textbox.c +++ b/src/lib/elementary/efl_ui_textbox.c @@ -1256,36 +1256,6 @@ _item_get(void *data, const char *item) return o; } -EOLIAN static void -_efl_ui_textbox_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *sd, const char *emission, const char *source) -{ - /* always pass to both edje objs */ - efl_layout_signal_emit(sd->entry_edje, emission, source); - - // FIXME: This should not be here! - efl_layout_signal_process(sd->entry_edje, EINA_TRUE); -} - -static Eina_Bool -_efl_ui_textbox_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd, const char *emission, const char *source, void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb) -{ - Eina_Bool ok; - - ok = efl_layout_signal_callback_add(pd->entry_edje, emission, source, func_data, func, func_free_cb); - - return ok; -} - -static Eina_Bool -_efl_ui_textbox_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Efl_Ui_Textbox_Data *pd, const char *emission, const char *source, void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb) -{ - Eina_Bool ok; - - ok = efl_layout_signal_callback_del(pd->entry_edje, emission, source, func_data, func, func_free_cb); - - return ok; -} - static void _selection_handlers_offset_calc(Evas_Object *obj, Evas_Object *handler) { diff --git a/src/lib/elementary/efl_ui_textbox.eo b/src/lib/elementary/efl_ui_textbox.eo index 67ed430848..dc3c428f1b 100644 --- a/src/lib/elementary/efl_ui_textbox.eo +++ b/src/lib/elementary/efl_ui_textbox.eo @@ -90,9 +90,6 @@ class @beta Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Click Efl.Gfx.Entity.size { set; } Efl.Canvas.Group.group_member_add; Efl.Canvas.Group.group_calculate; - Efl.Layout.Signal.signal_callback_add; - Efl.Layout.Signal.signal_callback_del; - Efl.Layout.Signal.signal_emit; Efl.Ui.Widget.on_access_activate; Efl.Ui.Widget.theme_apply; Efl.Ui.Focus.Object.on_focus_update;