jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=313eb563b50bec68019b3f570f3465bbdd0a5586
commit 313eb563b50bec68019b3f570f3465bbdd0a5586 Author: Jean-Philippe Andre <[email protected]> Date: Thu Nov 16 19:00:48 2017 +0900 win: Rename specific APIs to avoid clashes This renames 3 basic APIs specific to Win: - name - type - role Ref T5322 --- src/examples/elementary/toolbar_cxx_example_01.cc | 4 +-- src/lib/elementary/efl_ui_win.c | 16 +++++----- src/lib/elementary/efl_ui_win.eo | 38 +++++++++++++++-------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/src/examples/elementary/toolbar_cxx_example_01.cc b/src/examples/elementary/toolbar_cxx_example_01.cc index f76f959589..85fae352d7 100644 --- a/src/examples/elementary/toolbar_cxx_example_01.cc +++ b/src/examples/elementary/toolbar_cxx_example_01.cc @@ -21,8 +21,8 @@ elm_main(int argc, char* argv[]) [&] { win_1.text_set("Toolbar"); - win_1.name_set("toolbar"); - win_1.type_set(EFL_UI_WIN_BASIC); + win_1.win_name_set("toolbar"); + win_1.win_type_set(EFL_UI_WIN_BASIC); }); #if 0 diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 4c870ad82d..4ab637dd9a 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4657,7 +4657,7 @@ _elm_win_need_frame_adjust(Efl_Ui_Win_Data *sd, const char *engine) } static Eo * -_elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_Win_Type type) +_elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_Ui_Win_Type type) { Evas_Object *parent = NULL; Evas *e; @@ -5437,7 +5437,7 @@ _efl_ui_win_efl_text_text_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) } EOLIAN static void -_efl_ui_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Win_Type type) +_efl_ui_win_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Efl_Ui_Win_Type type) { if (efl_finalized_get(obj)) { @@ -5448,13 +5448,13 @@ _efl_ui_win_type_set(Eo *obj, Efl_Ui_Win_Data *sd, Elm_Win_Type type) } EOLIAN static Efl_Ui_Win_Type -_efl_ui_win_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_win_type_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { return sd->type; } EOLIAN static void -_efl_ui_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name) +_efl_ui_win_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name) { if (efl_finalized_get(obj)) { @@ -5465,7 +5465,7 @@ _efl_ui_win_name_set(Eo *obj, Efl_Ui_Win_Data *sd, const char *name) } EOLIAN static const char * -_efl_ui_win_name_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_win_name_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { return sd->name; } @@ -5503,7 +5503,7 @@ _efl_ui_win_noblank_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *pd) } EOLIAN static void -_efl_ui_win_role_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *role) +_efl_ui_win_win_role_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *role) { if (!role) return; eina_stringshare_replace(&(sd->role), role); @@ -5513,7 +5513,7 @@ _efl_ui_win_role_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const char *role) } EOLIAN static const char* -_efl_ui_win_role_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) +_efl_ui_win_win_role_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) { return sd->role; } @@ -8127,7 +8127,7 @@ _fake_canvas_set(Evas_Object *obj, Ecore_Evas *oee) } EAPI Evas_Object * -elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) +elm_win_add(Evas_Object *parent, const char *name, Efl_Ui_Win_Type type) { const Efl_Class *klass = MY_CLASS; diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 9dbbe3eeab..1b7bbd6846 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -476,9 +476,16 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, borderless: bool; [[If $true, the window is borderless.]] } } - @property role { + @property win_role { + /* FIXME: Do we actually need this? There is only support in X. */ + [[The role of the window. + + It is a hint of how the Window Manager should handle it. Unlike + @.win_type and @.win_name this can be changed at runtime. + ]] set { [[Set the role of the window.]] + legacy: elm_win_role_set; } get { [[Get the role of the window. @@ -487,46 +494,51 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, freed or modified. It will also be invalid if a new role is set or if the window is destroyed. ]] + legacy: elm_win_role_get; } values { role: string; [[The role to set.]] } } - @property name { + @property win_name { [[The window name. The meaning of name depends on the underlying windowing system. - The window name is a constructing property that need to be set at - creation within \@ref eo_add. + The window name is a construction property that can only be set at + creation time, before finalize. In C this means inside $efl_add(). Note: Once set, it can NOT be modified afterward. ]] set { - [[Can only be used at creation time, within \@ref eo_add.]] + [[Name can on be set before finalize.]] legacy: null; } - get { [[ @since 1.18 ]] } + get { + [[ @since 1.18 ]] + legacy: elm_win_name_get; + } values { name: string @nullable; [[Window name]] } } - @property type { + @property win_type { [[The type of the window. It is a hint of how the Window Manager should handle it. - The window type is a constructing property that need to be set at - creation within \@ref eo_add. + The window type is a construction property that can only be set at + creation time, before finalize. In C this means inside $efl_add(). Note: Once set, it can NOT be modified afterward. ]] set { - [[Can only be used at creation time, within \@ref eo_add.]] + [[Type can on be set before finalize.]] legacy: null; } get { - [[If the object is not window object, return #ELM_WIN_UNKNOWN.]] + [[If the object is not window object, returns $unknown.]] + legacy: elm_win_type_get; } values { type: Efl.Ui.Win.Type(Efl.Ui.Win.Type.unknown); [[Window type]] @@ -840,8 +852,8 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, Efl.Object.provider_find; } constructors { - .name; - .type; + .win_name; + .win_type; .accel_preference; } events { --
