bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=07cb2d2dcd294695eb7005d03e41c94ee05e6bb4
commit 07cb2d2dcd294695eb7005d03e41c94ee05e6bb4 Author: Marcel Hollerbach <[email protected]> Date: Tue Nov 14 18:56:08 2017 +0100 efl_ui_focus_object: document the bahaviour of the manager property --- src/lib/elementary/efl_ui_focus_composition.c | 1 + src/lib/elementary/efl_ui_focus_manager_calc.c | 2 ++ src/lib/elementary/efl_ui_focus_manager_root_focus.c | 2 ++ src/lib/elementary/efl_ui_focus_user.eo | 6 ++++-- src/lib/elementary/efl_ui_win.c | 1 + src/lib/elementary/elm_calendar.c | 1 + src/lib/elementary/elm_colorselector.c | 1 + src/lib/elementary/elm_entry.c | 1 + src/lib/elementary/elm_toolbar.c | 1 + src/lib/elementary/elm_widget.c | 1 + 10 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_focus_composition.c b/src/lib/elementary/efl_ui_focus_composition.c index 8d147e47f5..dcd1c7b00d 100644 --- a/src/lib/elementary/efl_ui_focus_composition.c +++ b/src/lib/elementary/efl_ui_focus_composition.c @@ -3,6 +3,7 @@ #endif #define EFL_UI_FOCUS_COMPOSITION_PROTECTED +#define EFL_UI_FOCUS_OBJECT_PROTECTED #include <Elementary.h> #include "elm_priv.h" diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c index f879d5440b..ce08129f1a 100644 --- a/src/lib/elementary/efl_ui_focus_manager_calc.c +++ b/src/lib/elementary/efl_ui_focus_manager_calc.c @@ -1,6 +1,8 @@ #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif +#define EFL_UI_FOCUS_OBJECT_PROTECTED + #include <Elementary.h> #include "elm_priv.h" 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 23deb0bb79..040aba24f7 100644 --- a/src/lib/elementary/efl_ui_focus_manager_root_focus.c +++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.c @@ -2,6 +2,8 @@ # include "elementary_config.h" #endif +#define EFL_UI_FOCUS_OBJECT_PROTECTED + #include <Elementary.h> #include "elm_priv.h" diff --git a/src/lib/elementary/efl_ui_focus_user.eo b/src/lib/elementary/efl_ui_focus_user.eo index c78a104602..1b8a6c7559 100644 --- a/src/lib/elementary/efl_ui_focus_user.eo +++ b/src/lib/elementary/efl_ui_focus_user.eo @@ -5,8 +5,10 @@ interface Efl.Ui.Focus.User { ]] methods { @property manager { - [[Describes which manager is used to register or should be used - to register this user. + [[Describes which manager is used to register. + + If a instance of this interface is the root of a manager this instance should not have the manager where it is root as this property. This other manager then this instance will be set as focused in the other manager. + This instance should be regiered there with it own manager as redirect. ]] get {} values { diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index d0fe99d61d..74a0950771 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -11,6 +11,7 @@ #define EFL_CANVAS_OBJECT_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED #define EFL_UI_WIN_INLINED_PROTECTED +#define EFL_UI_FOCUS_OBJECT_PROTECTED #define EFL_UI_WIN_BETA #include <Elementary.h> diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c index e236bdc56a..fbbcca9f13 100644 --- a/src/lib/elementary/elm_calendar.c +++ b/src/lib/elementary/elm_calendar.c @@ -5,6 +5,7 @@ #define EFL_ACCESS_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED +#define EFL_UI_FOCUS_OBJECT_PROTECTED #include <Elementary.h> #include "elm_priv.h" diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index e96ea0ac4b..4b18340d6d 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -6,6 +6,7 @@ #define EFL_ACCESS_COMPONENT_PROTECTED #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED +#define EFL_UI_FOCUS_OBJECT_PROTECTED #include <Elementary.h> #include "elm_priv.h" diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index c6018fca3c..948fa053cf 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c @@ -6,6 +6,7 @@ #define EFL_ACCESS_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED #define ELM_LAYOUT_PROTECTED +#define EFL_UI_FOCUS_OBJECT_PROTECTED #include <Elementary.h> #include <Elementary_Cursor.h> diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c index 6df060fc41..5160fd4df1 100644 --- a/src/lib/elementary/elm_toolbar.c +++ b/src/lib/elementary/elm_toolbar.c @@ -8,6 +8,7 @@ #define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_FOCUS_OBJECT_PROTECTED #include <Elementary.h> diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c index c38c20228d..73a1ece629 100644 --- a/src/lib/elementary/elm_widget.c +++ b/src/lib/elementary/elm_widget.c @@ -9,6 +9,7 @@ #define EFL_CANVAS_OBJECT_BETA #define EFL_INPUT_EVENT_PROTECTED #define EFL_UI_TRANSLATABLE_PROTECTED +#define EFL_UI_FOCUS_OBJECT_PROTECTED #include <Elementary.h> --
