jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d9855e9a3da818d93385c6804f5a37d185efb007
commit d9855e9a3da818d93385c6804f5a37d185efb007 Author: Yossi Kantor <[email protected]> Date: Wed Apr 2 17:53:53 2014 +0300 Eolian: Legacy integration of Evas Grid --- src/Makefile_Evas.am | 4 +- src/lib/evas/Evas_Legacy.h | 128 +-------------------------------------------- 2 files changed, 4 insertions(+), 128 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index f2edbe1..11db9a5 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -41,6 +41,7 @@ BUILT_SOURCES += \ lib/evas/canvas/evas.eo.h \ lib/evas/canvas/evas_grid.eo.c \ lib/evas/canvas/evas_grid.eo.h \ + lib/evas/canvas/evas_grid.eo.legacy.h \ lib/evas/canvas/evas_image.eo.c \ lib/evas/canvas/evas_image.eo.h \ lib/evas/canvas/evas_out.eo.c \ @@ -133,7 +134,8 @@ nodist_installed_evascanvasheaders_DATA = \ lib/evas/canvas/evas_smart_clipped.eo.legacy.h \ lib/evas/canvas/evas_table.eo.legacy.h \ lib/evas/canvas/evas_common_interface.eo.legacy.h \ - lib/evas/canvas/evas_object.eo.legacy.h + lib/evas/canvas/evas_object.eo.legacy.h \ + lib/evas/canvas/evas_grid.eo.legacy.h noinst_HEADERS = \ lib/evas/include/evas_inline.x \ diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index e48d5fa..56a21c5 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -5004,133 +5004,7 @@ EAPI Evas_Object *evas_object_table_child_get(const Evas_O */ EAPI Evas_Object *evas_object_grid_add(Evas *evas) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; -/** - * Create a grid that is child of a given element @a parent. - * - * @see evas_object_grid_add() - * @since 1.1 - */ -EAPI Evas_Object *evas_object_grid_add_to(Evas_Object *parent) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; - -/** - * Set the virtual resolution for the grid - * - * @param o The grid object to modify - * @param w The virtual horizontal size (resolution) in integer units - * @param h The virtual vertical size (resolution) in integer units - * @since 1.1 - */ -EAPI void evas_object_grid_size_set(Evas_Object *o, int w, int h) EINA_ARG_NONNULL(1); - -/** - * Get the current virtual resolution - * - * @param o The grid object to query - * @param w A pointer to an integer to store the virtual width - * @param h A pointer to an integer to store the virtual height - * @see evas_object_grid_size_set() - * @since 1.1 - */ -EAPI void evas_object_grid_size_get(const Evas_Object *o, int *w, int *h) EINA_ARG_NONNULL(1); - -/** - * Sets the mirrored mode of the grid. In mirrored mode the grid items go - * from right to left instead of left to right. That is, 0,0 is top right, not - * to left. - * - * @param o The grid object. - * @param mirrored the mirrored mode to set - * @since 1.1 - */ -EAPI void evas_object_grid_mirrored_set(Evas_Object *o, Eina_Bool mirrored) EINA_ARG_NONNULL(1); - -/** - * Gets the mirrored mode of the grid. - * - * @param o The grid object. - * @return @c EINA_TRUE if it's a mirrored grid, @c EINA_FALSE otherwise. - * @see evas_object_grid_mirrored_set() - * @since 1.1 - */ -EAPI Eina_Bool evas_object_grid_mirrored_get(const Evas_Object *o) EINA_ARG_NONNULL(1); - -/** - * Add a new child to a grid object. - * - * @param o The given grid object. - * @param child The child object to add. - * @param x The virtual x coordinate of the child - * @param y The virtual y coordinate of the child - * @param w The virtual width of the child - * @param h The virtual height of the child - * @return 1 on success, 0 on failure. - * @since 1.1 - */ -EAPI Eina_Bool evas_object_grid_pack(Evas_Object *o, Evas_Object *child, int x, int y, int w, int h) EINA_ARG_NONNULL(1, 2); - -/** - * Remove child from grid. - * - * @note removing a child will immediately call a walk over children in order - * to recalculate numbers of columns and rows. If you plan to remove - * all children, use evas_object_grid_clear() instead. - * - * @return 1 on success, 0 on failure. - * @since 1.1 - */ -EAPI Eina_Bool evas_object_grid_unpack(Evas_Object *o, Evas_Object *child) EINA_ARG_NONNULL(1, 2); - -/** - * Faster way to remove all child objects from a grid object. - * - * @param o The given grid object. - * @param clear if true, it will delete just removed children. - * @since 1.1 - */ -EAPI void evas_object_grid_clear(Evas_Object *o, Eina_Bool clear) EINA_ARG_NONNULL(1); - -/** - * Get the pack options for a grid child - * - * Get the pack x, y, width and height in virtual coordinates set by - * evas_object_grid_pack() - * @param o The grid object - * @param child The grid child to query for coordinates - * @param x The pointer to where the x coordinate will be returned - * @param y The pointer to where the y coordinate will be returned - * @param w The pointer to where the width will be returned - * @param h The pointer to where the height will be returned - * @return 1 on success, 0 on failure. - * @since 1.1 - */ -EAPI Eina_Bool evas_object_grid_pack_get(const Evas_Object *o, Evas_Object *child, int *x, int *y, int *w, int *h); - -/** - * Get an iterator to walk the list of children for the grid. - * - * @note Do not remove or delete objects while walking the list. - * @since 1.1 - */ -EAPI Eina_Iterator *evas_object_grid_iterator_new(const Evas_Object *o) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; - -/** - * Get an accessor to get random access to the list of children for the grid. - * - * @note Do not remove or delete objects while walking the list. - * @since 1.1 - */ -EAPI Eina_Accessor *evas_object_grid_accessor_new(const Evas_Object *o) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; - -/** - * Get the list of children for the grid. - * - * @note This is a duplicate of the list kept by the grid internally. - * It's up to the user to destroy it when it no longer needs it. - * It's possible to remove objects from the grid when walking this - * list, but these removals won't be reflected on it. - * @since 1.1 - */ -EAPI Eina_List *evas_object_grid_children_get(const Evas_Object *o) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; +#include "canvas/evas_grid.eo.legacy.h" /** * @} --
