jypark pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=80d0e4cb087d77ce0559710f8dd4acd3ebed88c6
commit 80d0e4cb087d77ce0559710f8dd4acd3ebed88c6 Author: Ji-Youn Park <[email protected]> Date: Thu Jun 2 17:37:07 2016 +0830 elm_win: remove elm_win_layer_set and inlined image get elm_win_layer_set is not supported int wayland. inlined image get api should alternative method to help app save, get pixel for TODO --- src/lib/elementary/elm_win.c | 51 ++++++++++++++++++++++--------------- src/lib/elementary/elm_win.eo | 35 ------------------------- src/lib/elementary/elm_win_legacy.h | 40 +++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 56 deletions(-) diff --git a/src/lib/elementary/elm_win.c b/src/lib/elementary/elm_win.c index 982950e..d792ece 100644 --- a/src/lib/elementary/elm_win.c +++ b/src/lib/elementary/elm_win.c @@ -4732,21 +4732,6 @@ _elm_win_efl_gfx_size_hint_step_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int * if (h) *h = sd->size_step_h; } -EOLIAN static void -_elm_win_layer_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, int layer) -{ - TRAP(sd, layer_set, layer); -#ifdef HAVE_ELEMENTARY_X - _elm_win_xwin_update(sd); -#endif -} - -EOLIAN static int -_elm_win_layer_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd) -{ - return ecore_evas_layer_get(sd->ee); -} - EAPI void elm_win_norender_push(Evas_Object *obj) { @@ -5036,12 +5021,6 @@ _elm_win_keygrab_unset(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, const char *key, E return ret; } -EOLIAN static Evas_Object* -_elm_win_inlined_image_object_get(Eo *obj EINA_UNUSED, Elm_Win_Data *sd) -{ - return sd->img_obj; -} - EOLIAN static void _elm_win_focus_highlight_enabled_set(Eo *obj EINA_UNUSED, Elm_Win_Data *sd, Eina_Bool enabled) { @@ -6369,4 +6348,34 @@ elm_win_profile_get(const Evas_Object *obj) return sd->profile.name; } +EAPI void +elm_win_layer_set(Evas_Object *obj, int layer) +{ + ELM_WIN_CHECK(obj); + ELM_WIN_DATA_GET_OR_RETURN(obj, sd); + + TRAP(sd, layer_set, layer); +#ifdef HAVE_ELEMENTARY_X + _elm_win_xwin_update(sd); +#endif +} + +EAPI int +elm_win_layer_get(const Evas_Object *obj) +{ + ELM_WIN_CHECK(obj) 0; + ELM_WIN_DATA_GET_OR_RETURN(obj, sd, 0); + + return ecore_evas_layer_get(sd->ee); +} + +EAPI Evas_Object* +elm_win_inlined_image_object_get(const Evas_Object *obj) +{ + ELM_WIN_CHECK(obj) NULL; + ELM_WIN_DATA_GET_OR_RETURN(obj, sd, NULL); + + return sd->img_obj; +} + #include "elm_win.eo.c" diff --git a/src/lib/elementary/elm_win.eo b/src/lib/elementary/elm_win.eo index a6e87fe..bd3c8ca 100644 --- a/src/lib/elementary/elm_win.eo +++ b/src/lib/elementary/elm_win.eo @@ -655,27 +655,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window, otherwise it is width divided by height.]] } } - @property layer { - set { - [[Set the layer of the window. - - What this means exactly will depend on the underlying engine - used. - - In the case of X11 backed engines, the value in $layer has the - following meanings - less than 3 means that the window will - be placed below all others, more than 5 means that the - window will be placed above all others, and anything else - means that the window will be placed in the default layer. - ]] - } - get { - [[Get the layer of the window.]] - } - values { - layer: int; [[The layer of the window.]] - } - } @property main_menu { get { [[Get the Main Menu of a window.]] @@ -695,20 +674,6 @@ class Elm.Win (Elm.Widget, Elm.Interface.Atspi.Window, legacy: null; } } - @property inlined_image_object { - get { - [[Get the inlined image object handle - - When you create a window with elm_win_add() of type - #ELM_WIN_INLINED_IMAGE, then the window is in fact an evas - image object inlined in the parent canvas. You can get this - object (be careful to not manipulate it as it is under - control of elementary), and use it to do things like get - pixel data, save the image to a file, etc. - ]] - return: Evas.Object; [[The inlined image object or $null if none exists.]] - } - } @property fake_canvas @protected { set { [[Internal. Used to completent the fake window type.]] diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h index e64a423..ad36279 100644 --- a/src/lib/elementary/elm_win_legacy.h +++ b/src/lib/elementary/elm_win_legacy.h @@ -960,3 +960,43 @@ EAPI void elm_win_profile_set(Evas_Object *obj, const char *profile); */ EAPI const char *elm_win_profile_get(const Evas_Object *obj); +/** + * @brief Set the layer of the window. + * + * What this means exactly will depend on the underlying engine used. + * + * In the case of X11 backed engines, the value in @c layer has the following + * meanings - less than 3 means that the window will be placed below all + * others, more than 5 means that the window will be placed above all others, + * and anything else means that the window will be placed in the default layer. + * + * @param[in] layer The layer of the window. + * + * @ingroup Elm_Win + */ +EAPI void elm_win_layer_set(Evas_Object *obj, int layer); + +/** + * @brief Get the layer of the window. + * + * @return The layer of the window. + * + * @ingroup Elm_Win + */ +EAPI int elm_win_layer_get(const Evas_Object *obj); + +/** + * @brief Get the inlined image object handle + * + * When you create a window with elm_win_add() of type #ELM_WIN_INLINED_IMAGE, + * then the window is in fact an evas image object inlined in the parent + * canvas. You can get this object (be careful to not manipulate it as it is + * under control of elementary), and use it to do things like get pixel data, + * save the image to a file, etc. + * + * @return The inlined image object or @c null if none exists. + * + * @ingroup Elm_Win + */ +EAPI Evas_Object *elm_win_inlined_image_object_get(const Evas_Object *obj); + --
