discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e87567c683e87bdc6cac776661e9d3f8d28384d6
commit e87567c683e87bdc6cac776661e9d3f8d28384d6 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 14 21:14:52 2018 -0500 evas_table: remove mirrored property use efl_ui_base.mirrored instead --- src/lib/evas/Evas_Legacy.h | 29 +++++++++++++++++++++++++++++ src/lib/evas/canvas/evas_object_table.c | 16 ++++++++++++++-- src/lib/evas/canvas/evas_table.eo | 15 +-------------- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index ba6e92a404..a29f14f57c 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -6912,6 +6912,35 @@ EAPI Eina_List *evas_object_box_children_get(const Evas_Object * */ EAPI Evas_Object *evas_object_table_add(Evas *evas) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; +/** + * @brief Control the mirrored mode of the table. In mirrored mode, the table + * items go from right to left instead of left to right. That is, 1,1 is top + * right, not top left. + * + * @param[in] obj The object. + * @param[in] mirrored @c true if mirrored, @c false otherwise + * + * @since 1.1 + * + * @ingroup Evas_Table + */ +EAPI void evas_object_table_mirrored_set(Eo *obj, Eina_Bool mirrored); + +/** + * @brief Control the mirrored mode of the table. In mirrored mode, the table + * items go from right to left instead of left to right. That is, 1,1 is top + * right, not top left. + * + * @param[in] obj The object. + * + * @return @c true if mirrored, @c false otherwise + * + * @since 1.1 + * + * @ingroup Evas_Table + */ +EAPI Eina_Bool evas_object_table_mirrored_get(const Eo *obj); + #include "canvas/evas_table.eo.legacy.h" /** diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c index 6db28e7a16..92fe53a871 100644 --- a/src/lib/evas/canvas/evas_object_table.c +++ b/src/lib/evas/canvas/evas_object_table.c @@ -1418,13 +1418,19 @@ _evas_table_child_get(Eo *o EINA_UNUSED, Evas_Table_Data *priv, unsigned short c } EOLIAN static Eina_Bool -_evas_table_mirrored_get(Eo *o EINA_UNUSED, Evas_Table_Data *priv) +_evas_table_efl_ui_base_mirrored_get(Eo *o EINA_UNUSED, Evas_Table_Data *priv) { return priv->is_mirrored; } +EAPI Eina_Bool +evas_object_table_mirrored_get(const Eo *obj) +{ + return efl_ui_mirrored_get(obj); +} + EOLIAN static void -_evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored) +_evas_table_efl_ui_base_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored) { if (priv->is_mirrored != mirrored) { @@ -1433,6 +1439,12 @@ _evas_table_mirrored_set(Eo *o, Evas_Table_Data *priv, Eina_Bool mirrored) } } +EAPI void +evas_object_table_mirrored_set(Eo *obj, Eina_Bool mirrored) +{ + efl_ui_mirrored_set(obj, mirrored); +} + EOLIAN static void _evas_table_class_constructor(Efl_Class *klass) { diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index d503e8d482..a4ed63a402 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -86,20 +86,6 @@ class Evas.Table (Efl.Canvas.Group) vertical: int; [[Vertical padding]] } } - @property mirrored { - [[Control the mirrored mode of the table. In mirrored mode, the table items go - from right to left instead of left to right. That is, 1,1 is top right, not - top left. - - @since 1.1]] - set { - } - get { - } - values { - mirrored: bool; [[$true if mirrored, $false otherwise]] - } - } @property col_row_size { get { [[Get the number of columns and rows this table takes. @@ -220,5 +206,6 @@ class Evas.Table (Efl.Canvas.Group) Efl.Gfx.size { set; } Efl.Gfx.position { set; } Efl.Canvas.Group.group_calculate; + Efl.Ui.Base.mirrored { get; set; } } } --
