From 3dd4a16cf723aee6f91e47a252786e288ae0d0d6 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Thu, 16 Nov 2017 11:31:26 +0900 Subject: [PATCH] elm: Rename elm_interface_atspi_widget_action mixin Reviewers: jpeg Subscribers: jenkins, cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5400 Change-Id: I5656302bd960511a3e0e0092512a92f4833f16b2 --- src/Makefile_Elementary.am | 6 +++--- src/lib/elementary/efl_ui_win.c | 2 +- src/lib/elementary/elm_genlist.c | 2 +- src/lib/elementary/elm_genlist.eo | 5 ++++- src/lib/elementary/elm_hover.c | 1 + src/lib/elementary/elm_hoversel.eo | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 0661d92..e5cdfef 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -37,7 +37,7 @@ elm_public_eolian_files = \ lib/elementary/efl_access_selection.eo \ lib/elementary/efl_access_text.eo \ lib/elementary/efl_access_value.eo \ - lib/elementary/elm_interface_atspi_widget_action.eo \ + lib/elementary/efl_access_widget_action.eo \ lib/elementary/efl_access_window.eo \ lib/elementary/elm_interface_fileselector.eo \ lib/elementary/elm_interface_scrollable.eo \ @@ -225,7 +225,7 @@ includesunstable_HEADERS = \ lib/elementary/elm_atspi_bridge.h \ lib/elementary/efl_access.h \ lib/elementary/efl_access_text.h \ - lib/elementary/elm_interface_atspi_widget_action.h \ + lib/elementary/efl_access_widget_action.h \ lib/elementary/efl_access_window.h \ lib/elementary/elm_interface_fileselector.h \ lib/elementary/elm_interface_scrollable.h \ @@ -625,7 +625,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/efl_access_selection.c \ lib/elementary/efl_access_text.c \ lib/elementary/efl_access_value.c \ - lib/elementary/elm_interface_atspi_widget_action.c \ + lib/elementary/efl_access_widget_action.c \ lib/elementary/efl_access_window.c \ lib/elementary/elm_interface_fileselector.c \ lib/elementary/elm_interface_scrollable.c \ diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 1de2df0..9cd7a74 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4,7 +4,7 @@ #define EFL_ACCESS_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_INPUT_EVENT_PROTECTED #define EFL_GFX_SIZE_HINT_PROTECTED #define EFL_CANVAS_OBJECT_BETA diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index ac661d7..1b3f4c8 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -9,7 +9,7 @@ //TIZEN_ONLY(20171114) genlist: enhance accessibility scroll & highlight #define EFL_ACCESS_COMPONENT_PROTECTED // -#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED +#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define ELM_WIDGET_ITEM_PROTECTED #define EFL_UI_FOCUS_COMPOSITION_PROTECTED diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index fa33206..a06e588 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -546,7 +546,7 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Elm.Interface_Scrollable.policy { get; set; } Efl.Access.children { get; } Efl.Access.state_set { get; } - Elm.Interface.Atspi_Widget_Action.elm_actions { get; } + Efl.Access.Widget.Action.elm_actions { get; } Efl.Access.Selection.selected_children_count { get; } Efl.Access.Selection.selected_child { get; } Efl.Access.Selection.selected_child_deselect; @@ -557,6 +557,9 @@ class Elm.Genlist (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Access.Selection.clear; Efl.Ui.Focus.Composition.prepare; Elm.Widget.focus_state_apply; + //TIZEN_ONLY(20171114) genlist: enhance accessibility scroll & highlight + Elm.Interface_Scrollable.content_pos_set; + // } events { item,focused; [[Called when genlist item got focus]] diff --git a/src/lib/elementary/elm_hover.c b/src/lib/elementary/elm_hover.c index e11cf76..cf21907 100644 --- a/src/lib/elementary/elm_hover.c +++ b/src/lib/elementary/elm_hover.c @@ -301,6 +301,7 @@ EOLIAN static Efl_Ui_Theme_Apply _elm_hover_elm_widget_theme_apply(Eo *obj, Elm_Hover_Data *sd) { Efl_Ui_Theme_Apply int_ret = EFL_UI_THEME_APPLY_FAILED; + int_ret = elm_obj_widget_theme_apply(efl_super(obj, MY_CLASS)); int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index bc6447f..1d0f7e0 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -2,7 +2,7 @@ import elm_general; class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Ui.Clickable, - Efl.Access.Widget.Action) + Elm.Interface.Atspi_Widget_Action) { [[Elementary hoversel class]] legacy_prefix: elm_hoversel; -- 2.7.4