cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=189fbd335b8cf473077e5be26c7ff0840213d328
commit 189fbd335b8cf473077e5be26c7ff0840213d328
Author: Xavi Artigas <xavierarti...@yahoo.es>
Date: Fri Apr 13 11:20:40 2018 +0200
Efl.Ui.Focus.Manager_* (from Efl.Ui.Focus.Manager.*)
Ref https://phab.enlightenment.org/T6847
Reviewed-by: Cedric Bail <ced...@osg.samsung.com>
---
src/lib/elementary/efl_ui_focus_manager.eo | 4 ++--
src/lib/elementary/efl_ui_focus_manager_calc.eo | 2 +-
src/lib/elementary/efl_ui_focus_manager_root_focus.eo | 8 ++++----
src/lib/elementary/efl_ui_focus_manager_sub.eo | 2 +-
src/lib/elementary/efl_ui_view_list.eo | 2 +-
src/lib/elementary/elm_interface_scrollable.eo | 2 +-
src/tests/elementary/focus_test_sub_main.eo | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/lib/elementary/efl_ui_focus_manager.eo
b/src/lib/elementary/efl_ui_focus_manager.eo
index 524483d1da..7a4e93b442 100644
--- a/src/lib/elementary/efl_ui_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_focus_manager.eo
@@ -18,7 +18,7 @@ struct Efl.Ui.Focus.Relations {
position_in_history : int; [[The position in the history stack]]
}
-struct Efl.Ui.Focus.Manager.Logical_End_Detail {
+struct Efl.Ui.Focus.Manager_Logical_End_Detail {
[[Structure holding the focus object with extra information on logical end
@since 1.21
@@ -136,7 +136,7 @@ interface Efl.Ui.Focus.Manager {
The returned object is the last object that would be returned if
you start at the root and move the direction into next.
]]
- return : Efl.Ui.Focus.Manager.Logical_End_Detail; [[Last object]]
+ return : Efl.Ui.Focus.Manager_Logical_End_Detail; [[Last object]]
}
reset_history {
[[Reset the history stack of this manager object.
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.eo
b/src/lib/elementary/efl_ui_focus_manager_calc.eo
index ff7d308beb..cfaffd826c 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Manager.Calc (Efl.Object, Efl.Ui.Focus.Manager) {
+class Efl.Ui.Focus.Manager_Calc (Efl.Object, Efl.Ui.Focus.Manager) {
[[Calculates the directions of Efl.Ui.Focus.Direction
Each registered item will get an other registered object in each
diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
index e4062df06d..4b3fe8f533 100644
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
@@ -1,9 +1,9 @@
-class Efl.Ui.Focus.Manager.Root_Focus(Efl.Ui.Focus.Manager.Calc) {
+class Efl.Ui.Focus.Manager_Root_Focus(Efl.Ui.Focus.Manager_Calc) {
[[ This class ensures that the root is at least focusable, if nothing else
is focusable]]
implements {
- Efl.Ui.Focus.Manager.Calc.register_logical;
- Efl.Ui.Focus.Manager.Calc.register;
- Efl.Ui.Focus.Manager.Calc.unregister;
+ Efl.Ui.Focus.Manager_Calc.register_logical;
+ Efl.Ui.Focus.Manager_Calc.register;
+ Efl.Ui.Focus.Manager_Calc.unregister;
Efl.Ui.Focus.Manager.manager_focus {set; get;}
Efl.Ui.Focus.Manager.fetch;
Efl.Ui.Focus.Manager.logical_end;
diff --git a/src/lib/elementary/efl_ui_focus_manager_sub.eo
b/src/lib/elementary/efl_ui_focus_manager_sub.eo
index 8348202b36..936c78e938 100644
--- a/src/lib/elementary/efl_ui_focus_manager_sub.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_sub.eo
@@ -1,4 +1,4 @@
-mixin Efl.Ui.Focus.Manager.Sub (Efl.Interface, Efl.Ui.Focus.Manager,
Efl.Object)
+mixin Efl.Ui.Focus.Manager_Sub (Efl.Interface, Efl.Ui.Focus.Manager,
Efl.Object)
{
[[A class that automatically registeres its border elements in the parent
manager
diff --git a/src/lib/elementary/efl_ui_view_list.eo
b/src/lib/elementary/efl_ui_view_list.eo
index 8b54fd3a26..09f82dc313 100644
--- a/src/lib/elementary/efl_ui_view_list.eo
+++ b/src/lib/elementary/efl_ui_view_list.eo
@@ -7,7 +7,7 @@ struct Efl.Ui.View.List.Item_Event
index: int;
}
class Efl.Ui.View.List (Efl.Ui.Layout.Object, Efl.Ui.View,
Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
- Efl.Access.Widget.Action, Efl.Access.Selection,
Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager.Sub,
+ Efl.Access.Widget.Action, Efl.Access.Selection,
Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.View.List.Model)
{
methods {
diff --git a/src/lib/elementary/elm_interface_scrollable.eo
b/src/lib/elementary/elm_interface_scrollable.eo
index b6554cd114..afe1678839 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -29,7 +29,7 @@ enum Elm.Scroller.Single_Direction
last [[Sentinel value to indicate last enum field during iteration]]
}
-mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager.Sub,
Efl.Ui.Widget)
+mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Widget)
{
[[Elm scrollable mixin]]
eo_prefix: elm_interface_scrollable;
diff --git a/src/tests/elementary/focus_test_sub_main.eo
b/src/tests/elementary/focus_test_sub_main.eo
index b60c431c87..ebf835831f 100644
--- a/src/tests/elementary/focus_test_sub_main.eo
+++ b/src/tests/elementary/focus_test_sub_main.eo
@@ -1,4 +1,4 @@
-class Focus.Test.Sub.Main(Efl.Object, Efl.Ui.Focus.Object,
Efl.Ui.Focus.Manager.Sub) {
+class Focus.Test.Sub.Main(Efl.Object, Efl.Ui.Focus.Object,
Efl.Ui.Focus.Manager_Sub) {
implements {
Efl.Ui.Focus.Object.focus_manager { get; }
Efl.Ui.Focus.Object.focus_parent { get; }
--
