aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-03-15 15:11:46 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-03-15 15:39:12 +0100
commit432deb1129f4c47d25d7488192f1696fdd778be0 (patch)
tree8a5a6046874690dbb6bec8d0c30a8460151b5690
parentefl_ui_focus_manager_calc: set redirect before setting focus (diff)
downloadefl-432deb1129f4c47d25d7488192f1696fdd778be0.tar.gz
efl_ui_focus_manager_root_focus: switch to focus adapter
-rw-r--r--src/Makefile_Elementary.am1
-rw-r--r--src/lib/elementary/efl_ui_focus_manager_root_focus.c40
-rw-r--r--src/lib/elementary/efl_ui_focus_rectangle.eo8
3 files changed, 3 insertions, 46 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index d4802313e6..b4ad6e3593 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -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 \
diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.c b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
index ce4352d98e..1a90cf2927 100644
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.c
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.c
@@ -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"
diff --git a/src/lib/elementary/efl_ui_focus_rectangle.eo b/src/lib/elementary/efl_ui_focus_rectangle.eo
deleted file mode 100644
index fdfb145b24..0000000000
--- a/src/lib/elementary/efl_ui_focus_rectangle.eo
+++ /dev/null
@@ -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;}
- }
-}