bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a25444f0d55edbd96a577ee913c7a0e6af829b95
commit a25444f0d55edbd96a577ee913c7a0e6af829b95 Author: Marcel Hollerbach <[email protected]> Date: Sat Feb 23 14:22:11 2019 +0100 efl_canvas_object: make is_frame_object internal it was decided that this property should be internal. So now it is internal. ref T7555 Reviewed-by: Mike Blumenkrantz <[email protected]> Differential Revision: https://phab.enlightenment.org/D8010 --- src/lib/elementary/efl_ui_widget.c | 1 + src/lib/elementary/efl_ui_widget.eo | 1 - src/lib/evas/Evas_Internal.h | 38 ++++++++++++++++++++++++++++++ src/lib/evas/Evas_Legacy.h | 40 ++++++++++++++++++++++++++++++++ src/lib/evas/canvas/efl_canvas_object.eo | 16 ------------- src/lib/evas/canvas/evas_object_main.c | 17 ++++++++++++++ 6 files changed, 96 insertions(+), 17 deletions(-) diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c index 9123831f93..47f854ab7a 100644 --- a/src/lib/elementary/efl_ui_widget.c +++ b/src/lib/elementary/efl_ui_widget.c @@ -6152,6 +6152,7 @@ ELM_PART_TEXT_DEFAULT_GET(efl_ui_widget, NULL) EFL_CANVAS_GROUP_ADD_DEL_OPS(efl_ui_widget), \ ELM_PART_CONTENT_DEFAULT_OPS(efl_ui_widget), \ ELM_PART_TEXT_DEFAULT_OPS(efl_ui_widget), \ + EFL_OBJECT_OP_FUNC(efl_canvas_object_is_frame_object_set, _efl_ui_widget_efl_canvas_object_is_frame_object_set), \ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_ui_widget_efl_object_dbg_info_get) #include "elm_widget_item.eo.c" diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index 9565c35ad2..d85e2fd100 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -636,7 +636,6 @@ abstract @beta Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Obje Efl.Gfx.Entity.scale { set; get; } Efl.Canvas.Object.clip { set; } Efl.Canvas.Object.no_render { set; } - Efl.Canvas.Object.is_frame_object { set; } Efl.Canvas.Group.group_calculate; Efl.Canvas.Group.group_member_del; Efl.Canvas.Group.group_member_add; diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h index da1330f16c..48b7928014 100644 --- a/src/lib/evas/Evas_Internal.h +++ b/src/lib/evas/Evas_Internal.h @@ -79,6 +79,44 @@ EOAPI Eo *efl_input_focus_instance_get(Efl_Object *owner, void **priv); EOAPI Eo *efl_input_hold_instance_get(Efl_Object *owner, void **priv); EOAPI Eo *efl_input_key_instance_get(Efl_Object *owner, void **priv); EOAPI Eo *efl_input_pointer_instance_get(Efl_Object *owner, void **priv); +/** + * @brief If @c true the object belongs to the window border decorations. + * + * This will be @c false by default, and should be @c false for all objects + * created by the application, unless swallowed in some very specific parts of + * the window. + * + * It is very unlikely that an application needs to call this manually, as the + * window will handle this feature automatically. + * + * @param[in] obj The object. + * @param[in] is_frame @c true if the object is a frame, @c false otherwise + * + * @since 1.2 + * + * @ingroup Efl_Canvas_Object + */ +EOAPI void efl_canvas_object_is_frame_object_set(Eo *obj, Eina_Bool is_frame); + +/** + * @brief If @c true the object belongs to the window border decorations. + * + * This will be @c false by default, and should be @c false for all objects + * created by the application, unless swallowed in some very specific parts of + * the window. + * + * It is very unlikely that an application needs to call this manually, as the + * window will handle this feature automatically. + * + * @param[in] obj The object. + * + * @return @c true if the object is a frame, @c false otherwise + * + * @since 1.2 + * + * @ingroup Efl_Canvas_Object + */ +EOAPI Eina_Bool efl_canvas_object_is_frame_object_get(const Eo *obj); EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE; #define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE)) diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 16ebfd26b6..c83eac94e8 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -8081,6 +8081,46 @@ EAPI void evas_object_text_filter_source_set(Evas_Object *obj, const char *name, * @since 1.20 */ EAPI Evas_Object *evas_object_event_grabber_add(Evas *e); + +/** + * @brief If @c true the object belongs to the window border decorations. + * + * This will be @c false by default, and should be @c false for all objects + * created by the application, unless swallowed in some very specific parts of + * the window. + * + * It is very unlikely that an application needs to call this manually, as the + * window will handle this feature automatically. + * + * @param[in] obj The object. + * @param[in] is_frame @c true if the object is a frame, @c false otherwise + * + * @since 1.2 + * + * @ingroup Evas_Object_Group + */ +EAPI void evas_object_is_frame_object_set(Efl_Canvas_Object *obj, Eina_Bool is_frame); + +/** + * @brief If @c true the object belongs to the window border decorations. + * + * This will be @c false by default, and should be @c false for all objects + * created by the application, unless swallowed in some very specific parts of + * the window. + * + * It is very unlikely that an application needs to call this manually, as the + * window will handle this feature automatically. + * + * @param[in] obj The object. + * + * @return @c true if the object is a frame, @c false otherwise + * + * @since 1.2 + * + * @ingroup Evas_Object_Group + */ +EAPI Eina_Bool evas_object_is_frame_object_get(const Efl_Canvas_Object *obj); + #include "canvas/efl_canvas_event_grabber.eo.legacy.h" #include "canvas/efl_canvas_animation_alpha.eo.legacy.h" diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index d29bafaefa..f66b6ac1f8 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -269,22 +269,6 @@ abstract @beta Efl.Canvas.Object extends Efl.Loop_Consumer implements Efl.Gfx.En legacy: null; return: bool; [[$true if the seat was removed from the focus list or $false otherwise.]] } - @property is_frame_object { - [[If $true the object belongs to the window border decorations. - - This will be $false by default, and should be $false for all objects - created by the application, unless swallowed in some very specific - parts of the window. - - It is very unlikely that an application needs to call this manually, - as the window will handle this feature automatically. - - @since 1.2 - ]] - values { - is_frame: bool; [[$true if the object is a frame, $false otherwise]] - } - } @property precise_is_inside { set { [[Set whether to use precise (usually expensive) point collision diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index e05e48338b..f26744baf4 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c @@ -2545,13 +2545,30 @@ evas_object_pointer_inside_get(const Evas_Object *eo_obj) return evas_object_pointer_inside_by_device_get(eo_obj, NULL); } +EAPI void +evas_object_is_frame_object_set(Efl_Canvas_Object *obj, Eina_Bool is_frame) +{ + efl_canvas_object_is_frame_object_set(obj, is_frame); +} + +EAPI Eina_Bool +evas_object_is_frame_object_get(const Efl_Canvas_Object *obj) +{ + return efl_canvas_object_is_frame_object_get(obj); +} + + /* Internal EO APIs and hidden overrides */ +EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_object_is_frame_object_set, EFL_FUNC_CALL(is_frame), Eina_Bool is_frame); +EOAPI EFL_FUNC_BODY_CONST(efl_canvas_object_is_frame_object_get, Eina_Bool, 0); EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_legacy_ctor) EOAPI EFL_VOID_FUNC_BODYV(efl_canvas_object_type_set, EFL_FUNC_CALL(type), const char *type) #define EFL_CANVAS_OBJECT_EXTRA_OPS \ EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_object_efl_object_dbg_info_get), \ + EFL_OBJECT_OP_FUNC(efl_canvas_object_is_frame_object_set, _efl_canvas_object_is_frame_object_set), \ + EFL_OBJECT_OP_FUNC(efl_canvas_object_is_frame_object_get, _efl_canvas_object_is_frame_object_get), \ EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_canvas_object_legacy_ctor), \ EFL_OBJECT_OP_FUNC(efl_canvas_object_type_set, _efl_canvas_object_type_set) --
