elementary: make focus manager update_children and update_order an internal function to not expose list<>.
Reviewed-by: Daniel Kolesa <daniel@octaforge.org> Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D11045
This commit is contained in:
parent
81cbe8bdc8
commit
fa0fb44d09
|
@ -2061,7 +2061,27 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_dirty_logic_unfreeze(Eo *obj, Ef
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_efl_ui_focus_manager_calc_update_children_ownership_fallback(Efl_Ui_Focus_Object *parent, Eina_List *children)
|
||||
{
|
||||
(void)parent;
|
||||
eina_list_free(children);
|
||||
}
|
||||
|
||||
EOAPI EFL_FUNC_BODYV_FALLBACK(efl_ui_focus_manager_calc_update_children, Eina_Bool, 0, _efl_ui_focus_manager_calc_update_children_ownership_fallback(parent, children);, EFL_FUNC_CALL(parent, children), Efl_Ui_Focus_Object *parent, Eina_List *children);
|
||||
|
||||
static void
|
||||
_efl_ui_focus_manager_calc_update_order_ownership_fallback(Efl_Ui_Focus_Object *parent, Eina_List *children)
|
||||
{
|
||||
(void)parent;
|
||||
eina_list_free(children);
|
||||
}
|
||||
|
||||
EOAPI EFL_VOID_FUNC_BODYV_FALLBACK(efl_ui_focus_manager_calc_update_order, _efl_ui_focus_manager_calc_update_order_ownership_fallback(parent, children);, EFL_FUNC_CALL(parent, children), Efl_Ui_Focus_Object *parent, Eina_List *children);
|
||||
|
||||
#define EFL_UI_FOCUS_MANAGER_CALC_EXTRA_OPS \
|
||||
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_focus_manager_calc_efl_object_dbg_info_get)
|
||||
EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_focus_manager_calc_efl_object_dbg_info_get), \
|
||||
EFL_OBJECT_OP_FUNC(efl_ui_focus_manager_calc_update_children, _efl_ui_focus_manager_calc_update_children), \
|
||||
EFL_OBJECT_OP_FUNC(efl_ui_focus_manager_calc_update_order, _efl_ui_focus_manager_calc_update_order)
|
||||
|
||||
#include "efl_ui_focus_manager_calc.eo.c"
|
||||
|
|
|
@ -55,25 +55,6 @@ class @beta Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus
|
|||
}
|
||||
return : bool; [[$true if successful, $false otherwise.]]
|
||||
}
|
||||
update_children {
|
||||
[[Sets the list of children to a different order.]]
|
||||
params {
|
||||
parent : Efl.Ui.Focus.Object; [[The parent to update.]]
|
||||
children : list<Efl.Ui.Focus.Object> @move; [[The list of children with the new order.]]
|
||||
}
|
||||
return : bool; [[$true if successful, $false otherwise.]]
|
||||
}
|
||||
update_order {
|
||||
[[Sets the list of children to a different order.
|
||||
|
||||
Objects in the list which are not children of $parent are ignored.
|
||||
Compare to @.update_children.
|
||||
]]
|
||||
params {
|
||||
parent : Efl.Ui.Focus.Object; [[The parent to update.]]
|
||||
children : list<Efl.Ui.Focus.Object> @move; [[The list of objects with the new order.]]
|
||||
}
|
||||
}
|
||||
unregister {
|
||||
[[Unregister the given item from the focus graph.]]
|
||||
params {
|
||||
|
|
|
@ -852,6 +852,10 @@ void _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor
|
|||
void _efl_ui_focus_manager_redirect_events_del(Efl_Ui_Focus_Manager *manager, Eo *obj);
|
||||
void _efl_ui_focus_manager_redirect_events_add(Efl_Ui_Focus_Manager *manager, Eo *obj);
|
||||
|
||||
EOAPI Eina_Bool efl_ui_focus_manager_calc_update_children(Eo *obj, Efl_Ui_Focus_Object *parent, Eina_List *children EFL_TRANSFER_OWNERSHIP);
|
||||
EOAPI void efl_ui_focus_manager_calc_update_order(Eo *obj, Efl_Ui_Focus_Object *parent, Eina_List *children EFL_TRANSFER_OWNERSHIP);
|
||||
|
||||
|
||||
void _efl_access_shutdown(void);
|
||||
|
||||
/* Combobox: no proper support for Efl.Part API yet. */
|
||||
|
|
|
@ -16,6 +16,8 @@
|
|||
Efl_Ui_Focus_Object* name; \
|
||||
name = focus_test_object_new("" #name "",x, y, w, h); \
|
||||
|
||||
/* This is an internal function at the moment, but an exported symbol and can be used by tests */
|
||||
Eina_Bool efl_ui_focus_manager_calc_update_children(Eo *obj, Efl_Ui_Focus_Object *parent, Eina_List *children EFL_TRANSFER_OWNERSHIP);
|
||||
|
||||
Efl_Ui_Focus_Object* focus_test_object_new(const char *name, int x, int y, int w, int h);
|
||||
|
||||
|
|
Loading…
Reference in New Issue