dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efl_ui_focus_manager_root_focus: switch to focus adapter

This commit is contained in:
Marcel Hollerbach 2018-03-15 15:11:46 +01:00
parent c8ba7a070f
commit 432deb1129
3 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile_Elementary.am
View File

@ -130,7 +130,6 @@ elm_private_eolian_files = \
lib/elementary/efl_ui_internal_text_interactive.eo \
lib/elementary/efl_ui_focus_composition_adapter.eo \
lib/elementary/efl_ui_win_part.eo \
lib/elementary/efl_ui_focus_rectangle.eo \
lib/elementary/efl_ui_focus_parent_provider.eo \
lib/elementary/efl_ui_focus_parent_provider_standard.eo \
lib/elementary/efl_ui_focus_parent_provider_gen.eo \

40
src/lib/elementary/efl_ui_focus_manager_root_focus.c
View File

@ -7,7 +7,7 @@
#include <Elementary.h>
#include "elm_priv.h"
#include "efl_ui_focus_rectangle.eo.h"
#include "efl_ui_focus_composition_adapter.eo.h"
#define MY_CLASS EFL_UI_FOCUS_MANAGER_ROOT_FOCUS_CLASS
@ -138,8 +138,8 @@ _efl_ui_focus_manager_root_focus_efl_object_finalize(Eo *obj, Efl_Ui_Focus_Manag
pd->root = efl_ui_focus_manager_root_get(obj);
pd->rect = efl_add(EFL_UI_FOCUS_RECTANGLE_CLASS, evas_object_evas_get(pd->root));
pd->rect = efl_add(EFL_UI_FOCUS_COMPOSITION_ADAPTER_CLASS, pd->root);
efl_ui_focus_composition_adapter_canvas_object_set(pd->rect, pd->root);
EINA_SAFETY_ON_NULL_RETURN_VAL(pd->rect, NULL);
pd->iterator_list = eina_list_append(pd->iterator_list, pd->root);
@ -149,38 +149,4 @@ _efl_ui_focus_manager_root_focus_efl_object_finalize(Eo *obj, Efl_Ui_Focus_Manag
return ret;
}
#include "efl_ui_focus_manager_root_focus.eo.c"
/* focus rectangle implementation */
typedef struct {
Eina_Bool focus;
} Efl_Ui_Focus_Rectangle_Data;
EOLIAN static Eina_Rect
_efl_ui_focus_rectangle_efl_ui_focus_object_focus_geometry_get(Eo *obj, Efl_Ui_Focus_Rectangle_Data *pd EINA_UNUSED)
{
Eina_Rect geom;
evas_object_geometry_get(obj, &geom.x, &geom.y, &geom.w, &geom.h);
return geom;
}
EOLIAN static void
_efl_ui_focus_rectangle_efl_ui_focus_object_focus_set(Eo *obj, Efl_Ui_Focus_Rectangle_Data *pd, Eina_Bool focus)
{
efl_ui_focus_object_focus_set(efl_super(obj, EFL_UI_FOCUS_RECTANGLE_CLASS), focus);
pd->focus = focus;
}
EOLIAN static Eina_Bool
_efl_ui_focus_rectangle_efl_ui_focus_object_focus_get(Eo *obj EINA_UNUSED, Efl_Ui_Focus_Rectangle_Data *pd)
{
return pd->focus;
}
#include "efl_ui_focus_rectangle.eo.c"

8
src/lib/elementary/efl_ui_focus_rectangle.eo
View File

@ -1,8 +0,0 @@
class Efl.Ui.Focus.Rectangle (Efl.Canvas.Rectangle, Efl.Ui.Focus.Object)
{
[[EFL UI Focus Rectangle class]]
implements {
Efl.Ui.Focus.Object.focus_geometry {get;}
Efl.Ui.Focus.Object.focus {set; get;}
}
}