diff options
author | Daniel Hirt <hirt.danny@gmail.com> | 2017-06-05 00:53:17 +0300 |
---|---|---|
committer | Daniel Hirt <hirt.danny@gmail.com> | 2017-06-05 00:53:17 +0300 |
commit | d3b24463032fade660fe1750d493c6ccb3cd7959 (patch) | |
tree | c4310e1c43f4ab47d06eaffb1b452e5ab5a72c55 | |
parent | 794653b143474f24fd3910ca74fbd78ea8802840 (diff) | |
download | efl-d3b24463032fade660fe1750d493c6ccb3cd7959.tar.gz |
Elm fileselector_entry: use part with efl_text
-rw-r--r-- | src/lib/elementary/elc_fileselector_entry.c | 10 | ||||
-rw-r--r-- | src/lib/elementary/elm_fileselector_entry.eo | 1 | ||||
-rw-r--r-- | src/lib/elementary/elm_fileselector_entry_internal_part.eo | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 2f011b7d4a..9c31c5e45a 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -256,11 +256,11 @@ _elm_fileselector_entry_elm_widget_disable(Eo *obj, Elm_Fileselector_Entry_Data } EOLIAN static Eina_Bool -_elm_fileselector_entry_elm_layout_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, const char *label) +_elm_fileselector_entry_text_set(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part, const char *label) { if (part && strcmp(part, "default")) { - return elm_obj_layout_text_set(efl_super(obj, MY_CLASS), part, label); + efl_text_set(efl_part(efl_super(obj, MY_CLASS), part), label); } elm_object_text_set(sd->button, label); @@ -268,12 +268,12 @@ _elm_fileselector_entry_elm_layout_text_set(Eo *obj, Elm_Fileselector_Entry_Data } EOLIAN static const char * -_elm_fileselector_entry_elm_layout_text_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part) +_elm_fileselector_entry_text_get(Eo *obj, Elm_Fileselector_Entry_Data *sd, const char *part) { if (part && strcmp(part, "default")) { const char *text = NULL; - text = elm_obj_layout_text_get(efl_super(obj, MY_CLASS), part); + text = efl_text_get(efl_part(efl_super(obj, MY_CLASS), part)); return text; } @@ -681,6 +681,8 @@ ELM_PART_OVERRIDE(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, El ELM_PART_OVERRIDE_CONTENT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) ELM_PART_OVERRIDE_CONTENT_UNSET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) +ELM_PART_OVERRIDE_TEXT_SET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) +ELM_PART_OVERRIDE_TEXT_GET(elm_fileselector_entry, ELM_FILESELECTOR_ENTRY, ELM_LAYOUT, Elm_Fileselector_Entry_Data, Elm_Part_Data) #include "elm_fileselector_entry_internal_part.eo.c" /* Efl.Part end */ diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo index e69505507a..50667a99f0 100644 --- a/src/lib/elementary/elm_fileselector_entry.eo +++ b/src/lib/elementary/elm_fileselector_entry.eo @@ -11,7 +11,6 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector, Elm.Widget.focus_next; Elm.Widget.disable; Elm.Widget.focus_direction_manager_is; - Elm.Layout.text { get; set; } Elm.Layout.sizing_eval; Elm.Interface.Fileselector.selected_model_get; Elm.Interface.Fileselector.selected_model_set; diff --git a/src/lib/elementary/elm_fileselector_entry_internal_part.eo b/src/lib/elementary/elm_fileselector_entry_internal_part.eo index 6c1ede2616..b5cb388083 100644 --- a/src/lib/elementary/elm_fileselector_entry_internal_part.eo +++ b/src/lib/elementary/elm_fileselector_entry_internal_part.eo @@ -1,9 +1,10 @@ -class Elm.Fileselector.Entry.Internal.Part (Elm.Layout.Internal.Part) +class Elm.Fileselector.Entry.Internal.Part (Elm.Layout.Internal.Part, Efl.Text) { [[Elementary fileselector entry internal part class]] data: null; implements { Efl.Container.content { get; set; } Efl.Container.content_unset; + Efl.Text.text { set; get; } } } |