diff options
-rw-r--r-- | src/lib/elementary/elm_entry.c | 32 | ||||
-rw-r--r-- | src/lib/elementary/elm_entry.eo | 3 |
2 files changed, 30 insertions, 5 deletions
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c index 6adff14..58097a7 100644 --- a/src/lib/elementary/elm_entry.c +++ b/src/lib/elementary/elm_entry.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED | 7 | #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED |
8 | #define ELM_LAYOUT_PROTECTED | 8 | #define ELM_LAYOUT_PROTECTED |
9 | #define EFL_UI_FOCUS_OBJECT_PROTECTED | 9 | #define EFL_UI_FOCUS_OBJECT_PROTECTED |
10 | #define EFL_ACCESS_WIDGET_ACTION_PROTECTED | ||
10 | 11 | ||
11 | #include <Elementary.h> | 12 | #include <Elementary.h> |
12 | #include <Elementary_Cursor.h> | 13 | #include <Elementary_Cursor.h> |
@@ -5418,11 +5419,9 @@ _elm_entry_anchor_hover_end(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd) | |||
5418 | } | 5419 | } |
5419 | /* END - ANCHOR HOVER */ | 5420 | /* END - ANCHOR HOVER */ |
5420 | 5421 | ||
5421 | EOLIAN static Eina_Bool | 5422 | static void |
5422 | _elm_entry_elm_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) | 5423 | _activate(Evas_Object *obj) |
5423 | { | 5424 | { |
5424 | if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; | ||
5425 | |||
5426 | ELM_ENTRY_DATA_GET(obj, sd); | 5425 | ELM_ENTRY_DATA_GET(obj, sd); |
5427 | 5426 | ||
5428 | if (!elm_widget_disabled_get(obj) && | 5427 | if (!elm_widget_disabled_get(obj) && |
@@ -5433,6 +5432,14 @@ _elm_entry_elm_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSE | |||
5433 | if (sd->editable && sd->input_panel_enable) | 5432 | if (sd->editable && sd->input_panel_enable) |
5434 | edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); | 5433 | edje_object_part_text_input_panel_show(sd->entry_edje, "elm.text"); |
5435 | } | 5434 | } |
5435 | } | ||
5436 | |||
5437 | EOLIAN static Eina_Bool | ||
5438 | _elm_entry_elm_widget_on_access_activate(Eo *obj, Elm_Entry_Data *_pd EINA_UNUSED, Efl_Ui_Activate act) | ||
5439 | { | ||
5440 | if (act != EFL_UI_ACTIVATE_DEFAULT) return EINA_FALSE; | ||
5441 | _activate(obj); | ||
5442 | |||
5436 | return EINA_TRUE; | 5443 | return EINA_TRUE; |
5437 | } | 5444 | } |
5438 | 5445 | ||
@@ -6040,6 +6047,23 @@ _elm_entry_efl_access_name_get(Eo *obj, Elm_Entry_Data *sd) | |||
6040 | return _elm_widget_accessible_plain_name_get(obj, ret); | 6047 | return _elm_widget_accessible_plain_name_get(obj, ret); |
6041 | } | 6048 | } |
6042 | 6049 | ||
6050 | static Eina_Bool | ||
6051 | _action_activate(Evas_Object *obj, const char *params EINA_UNUSED) | ||
6052 | { | ||
6053 | _activate(obj); | ||
6054 | return EINA_TRUE; | ||
6055 | } | ||
6056 | |||
6057 | EOLIAN const Efl_Access_Action_Data * | ||
6058 | _elm_entry_efl_access_widget_action_elm_actions_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd EINA_UNUSED) | ||
6059 | { | ||
6060 | static Efl_Access_Action_Data atspi_actions[] = { | ||
6061 | { "activate", "activate", NULL, _action_activate }, | ||
6062 | { NULL, NULL, NULL, NULL} | ||
6063 | }; | ||
6064 | return &atspi_actions[0]; | ||
6065 | } | ||
6066 | |||
6043 | /* Efl.Part begin */ | 6067 | /* Efl.Part begin */ |
6044 | 6068 | ||
6045 | ELM_PART_OVERRIDE(elm_entry, ELM_ENTRY, Elm_Entry_Data) | 6069 | ELM_PART_OVERRIDE(elm_entry, ELM_ENTRY, Elm_Entry_Data) |
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index ea7d43d..9bb1d6d 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo | |||
@@ -117,7 +117,7 @@ enum Elm.Cnp_Mode | |||
117 | 117 | ||
118 | class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, | 118 | class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, |
119 | Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, | 119 | Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, |
120 | Efl.Ui.Selectable, Efl.Ui.Scrollable) | 120 | Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Access.Widget.Action) |
121 | { | 121 | { |
122 | [[Elementary entry class]] | 122 | [[Elementary entry class]] |
123 | legacy_prefix: elm_entry; | 123 | legacy_prefix: elm_entry; |
@@ -989,6 +989,7 @@ class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, | |||
989 | Efl.Access.Editable.Text.cut; | 989 | Efl.Access.Editable.Text.cut; |
990 | Efl.Access.Editable.Text.delete; | 990 | Efl.Access.Editable.Text.delete; |
991 | Efl.Access.Editable.Text.paste; | 991 | Efl.Access.Editable.Text.paste; |
992 | Efl.Access.Widget.Action.elm_actions { get; } | ||
992 | Efl.File.file { get; set; } | 993 | Efl.File.file { get; set; } |
993 | Efl.Part.part; | 994 | Efl.Part.part; |
994 | } | 995 | } |