enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

evas_grid: size -> grid_size 

this conflicted with efl_ui_base.size
This commit is contained in:
Mike Blumenkrantz 2018-02-14 21:14:52 -05:00
parent 2caaf09ea2
commit f19da9b4a8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/evas/canvas/evas_grid.eo
View File

@ -4,18 +4,20 @@ class Evas.Grid (Efl.Canvas.Group)
legacy_prefix: evas_object_grid; legacy_prefix: evas_object_grid;
eo_prefix: evas_obj_grid; eo_prefix: evas_obj_grid;
methods { methods {
@property size { @property grid_size {
set { set {
[[Set the virtual resolution for the grid [[Set the virtual resolution for the grid
@since 1.1]] @since 1.1]]
legacy: evas_object_grid_size_set;
} }
get { get {
[[Get the current virtual resolution [[Get the current virtual resolution
See also @.size.set See also @.grid_size.set
@since 1.1]] @since 1.1]]
legacy: evas_object_grid_size_get;
} }
values { values {
w: int; [[The virtual horizontal size (resolution) in integer units.]] w: int; [[The virtual horizontal size (resolution) in integer units.]]

4
src/lib/evas/canvas/evas_object_grid.c
View File

@ -302,7 +302,7 @@ _evas_grid_add_to(Eo *parent, Evas_Grid_Data *_pd EINA_UNUSED)
} }
EOLIAN static void EOLIAN static void
_evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h) _evas_grid_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
{ {
if ((priv->size.w == w) && (priv->size.h == h)) return; if ((priv->size.w == w) && (priv->size.h == h)) return;
priv->size.w = w; priv->size.w = w;
@ -311,7 +311,7 @@ _evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
} }
EOLIAN static void EOLIAN static void
_evas_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h) _evas_grid_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h)
{ {
if (w) *w = priv->size.w; if (w) *w = priv->size.w;
if (h) *h = priv->size.h; if (h) *h = priv->size.h;