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
commitf19da9b4a8d0b2271d7e58e88c48830bc3586b86 (patch)
tree929ab9a3fe67ab33e0a5bf5731c4a447ed1a9d5d
parent2caaf09ea2545a85b92e8c4ac71c678b90b9cdd8 (diff)
evas_grid: size -> grid_size
this conflicted with efl_ui_base.size
-rw-r--r--src/lib/evas/canvas/evas_grid.eo6
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index a314110..f1b32c7 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -4,18 +4,20 @@ 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 size { 7 @property grid_size {
8 set { 8 set {
9 [[Set the virtual resolution for the grid 9 [[Set the virtual resolution for the grid
10 10
11 @since 1.1]] 11 @since 1.1]]
12 legacy: evas_object_grid_size_set;
12 } 13 }
13 get { 14 get {
14 [[Get the current virtual resolution 15 [[Get the current virtual resolution
15 16
16 See also @.size.set 17 See also @.grid_size.set
17 18
18 @since 1.1]] 19 @since 1.1]]
20 legacy: evas_object_grid_size_get;
19 } 21 }
20 values { 22 values {
21 w: int; [[The virtual horizontal size (resolution) in integer units.]] 23 w: int; [[The virtual horizontal size (resolution) in integer units.]]
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 5c4cda9..fccc135 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -302,7 +302,7 @@ _evas_grid_add_to(Eo *parent, Evas_Grid_Data *_pd EINA_UNUSED)
302} 302}
303 303
304EOLIAN static void 304EOLIAN static void
305_evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h) 305_evas_grid_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
306{ 306{
307 if ((priv->size.w == w) && (priv->size.h == h)) return; 307 if ((priv->size.w == w) && (priv->size.h == h)) return;
308 priv->size.w = w; 308 priv->size.w = w;
@@ -311,7 +311,7 @@ _evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
311} 311}
312 312
313EOLIAN static void 313EOLIAN static void
314_evas_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h) 314_evas_grid_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h)
315{ 315{
316 if (w) *w = priv->size.w; 316 if (w) *w = priv->size.w;
317 if (h) *h = priv->size.h; 317 if (h) *h = priv->size.h;