summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:11:00 -0500
commit2caaf09ea2545a85b92e8c4ac71c678b90b9cdd8 (patch)
tree94149341ca4a1233a9146b151e1bbd0ebdc992be
parentf90366595736b568f1c15bb7810f5c3e38260157 (diff)
evas_grid: remove mirrored property
use efl_ui_base property
-rw-r--r--src/lib/evas/Evas_Legacy.h30
-rw-r--r--src/lib/evas/canvas/evas_grid.eo20
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c16
3 files changed, 45 insertions, 21 deletions
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 7532020..ba6e92a 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -6932,6 +6932,36 @@ EAPI Evas_Object *evas_object_table_add(Evas *evas) EINA_W
6932 */ 6932 */
6933EAPI Evas_Object *evas_object_grid_add(Evas *evas) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; 6933EAPI Evas_Object *evas_object_grid_add(Evas *evas) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
6934 6934
6935
6936/**
6937 * @brief Sets the mirrored mode of the grid. In mirrored mode the grid items
6938 * go from right to left instead of left to right. That is, 0,0 is top right,
6939 * not to left.
6940 *
6941 * @param[in] obj The object.
6942 * @param[in] mirrored @c true if mirrored mode is set, @c false otherwise
6943 *
6944 * @since 1.1
6945 *
6946 * @ingroup Evas_Grid
6947 */
6948EAPI void evas_object_grid_mirrored_set(Eo *obj, Eina_Bool mirrored);
6949
6950/**
6951 * @brief Gets the mirrored mode of the grid.
6952 *
6953 * See also @ref evas_object_grid_mirrored_set
6954 *
6955 * @param[in] obj The object.
6956 *
6957 * @return @c true if mirrored mode is set, @c false otherwise
6958 *
6959 * @since 1.1
6960 *
6961 * @ingroup Evas_Grid
6962 */
6963EAPI Eina_Bool evas_object_grid_mirrored_get(const Eo *obj);
6964
6935#include "canvas/evas_grid.eo.legacy.h" 6965#include "canvas/evas_grid.eo.legacy.h"
6936 6966
6937/** 6967/**
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 11e3614..a314110 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -4,25 +4,6 @@ class Evas.Grid (Efl.Canvas.Group)
4 legacy_prefix: evas_object_grid; 4 legacy_prefix: evas_object_grid;
5 eo_prefix: evas_obj_grid; 5 eo_prefix: evas_obj_grid;
6 methods { 6 methods {
7 @property mirrored {
8 set {
9 [[Sets the mirrored mode of the grid. In mirrored mode the grid items go
10 from right to left instead of left to right. That is, 0,0 is top right, not
11 to left.
12
13 @since 1.1]]
14 }
15 get {
16 [[Gets the mirrored mode of the grid.
17
18 See also @.mirrored.set
19
20 @since 1.1]]
21 }
22 values {
23 mirrored: bool; [[$true if mirrored mode is set, $false otherwise]]
24 }
25 }
26 @property size { 7 @property size {
27 set { 8 set {
28 [[Set the virtual resolution for the grid 9 [[Set the virtual resolution for the grid
@@ -135,5 +116,6 @@ class Evas.Grid (Efl.Canvas.Group)
135 } 116 }
136 implements { 117 implements {
137 Efl.Object.constructor; 118 Efl.Object.constructor;
119 Efl.Ui.Base.mirrored {get; set;}
138 } 120 }
139} 121}
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index f323384..5c4cda9 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -480,13 +480,13 @@ _evas_grid_children_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv)
480} 480}
481 481
482EOLIAN static Eina_Bool 482EOLIAN static Eina_Bool
483_evas_grid_mirrored_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv) 483_evas_grid_efl_ui_base_mirrored_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv)
484{ 484{
485 return priv->is_mirrored; 485 return priv->is_mirrored;
486} 486}
487 487
488EOLIAN static void 488EOLIAN static void
489_evas_grid_mirrored_set(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, Eina_Bool mirrored) 489_evas_grid_efl_ui_base_mirrored_set(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, Eina_Bool mirrored)
490{ 490{
491 mirrored = !!mirrored; 491 mirrored = !!mirrored;
492 if (priv->is_mirrored != mirrored) 492 if (priv->is_mirrored != mirrored)
@@ -496,4 +496,16 @@ _evas_grid_mirrored_set(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, Eina_Bool mirro
496 } 496 }
497} 497}
498 498
499EAPI void
500evas_object_grid_mirrored_set(Evas_Grid *obj, Eina_Bool mirrored)
501{
502 efl_ui_mirrored_set(obj, mirrored);
503}
504
505EAPI Eina_Bool
506evas_object_grid_mirrored_get(const Evas_Grid *obj)
507{
508 return efl_ui_mirrored_get(obj);
509}
510
499#include "canvas/evas_grid.eo.c" 511#include "canvas/evas_grid.eo.c"