enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

efl_ui_win: Add back title_set as text.set 

add jp's code again.
This commit is contained in:
Ji-Youn Park 2016-06-08 08:56:39 +08:30
parent 122f5eb3a4
commit 54f88b0368
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/elementary/efl_ui_win.c
View File

@ -4172,6 +4172,24 @@ _efl_ui_win_eo_base_constructor(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED)
return obj;
}
EOLIAN static void
_efl_ui_win_efl_text_text_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *title)
{
if (!title) return;
eina_stringshare_replace(&(sd->title), title);
if (sd->ee)
TRAP(sd, title_set, sd->title);
if (sd->frame_obj)
edje_object_part_text_escaped_set
(sd->frame_obj, "elm.text.title", sd->title);
}
EOLIAN static const char*
_efl_ui_win_efl_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd)
{
return sd->title;
}
EOLIAN static void
_efl_ui_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Win_Type type)
{
@ -6185,25 +6203,13 @@ elm_win_shaped_get(const Evas_Object *obj)
EAPI void
elm_win_title_set(Evas_Object *obj, const char *title)
{
ELM_WIN_CHECK(obj);
ELM_WIN_DATA_GET_OR_RETURN(obj, sd);
if (!title) return;
eina_stringshare_replace(&(sd->title), title);
if (sd->ee)
TRAP(sd, title_set, sd->title);
if (sd->frame_obj)
edje_object_part_text_escaped_set
(sd->frame_obj, "elm.text.title", sd->title);
efl_text_set(obj, title);
}
EAPI const char*
elm_win_title_get(const Evas_Object *obj)
{
ELM_WIN_CHECK(obj) NULL;
ELM_WIN_DATA_GET_OR_RETURN(obj, sd, NULL);
return sd->title;
return efl_text_get(obj);
}
EAPI void

4
src/lib/elementary/efl_ui_win.eo
View File

@ -146,7 +146,7 @@ enum Efl.Ui.Win.Urgent_Mode
class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window,
Elm.Interface.Atspi_Widget_Action, Efl.Pack,
Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Gfx.Size.Hint)
Efl.Gfx.Size.Hint, Efl.Text)
{
legacy_prefix: elm_win;
eo_prefix: efl_ui_win;
@ -805,6 +805,8 @@ class Efl.Ui.Win (Elm.Widget, Elm.Interface.Atspi.Window,
Efl.Gfx.Size.Hint.base.get;
Efl.Gfx.Size.Hint.step.set;
Efl.Gfx.Size.Hint.step.get;
Efl.Text.text.set;
Efl.Text.text.get;
}
constructors {
.name;