NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas_textgrid: 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 e87567c683
commit 005f3ef955
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/evas/canvas/evas_object_textgrid.c
View File

@ -916,7 +916,7 @@ _evas_textgrid_efl_object_constructor(Eo *eo_obj, Evas_Textgrid_Data *class_data
}
EOLIAN static void
_evas_textgrid_size_set(Eo *eo_obj, Evas_Textgrid_Data *o, int w, int h)
_evas_textgrid_grid_size_set(Eo *eo_obj, Evas_Textgrid_Data *o, int w, int h)
{
int i;
Evas_Object_Protected_Data *obj = efl_data_scope_get(eo_obj, EFL_CANVAS_OBJECT_CLASS);
@ -959,7 +959,7 @@ _evas_textgrid_size_set(Eo *eo_obj, Evas_Textgrid_Data *o, int w, int h)
}
EOLIAN static void
_evas_textgrid_size_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int *w, int *h)
_evas_textgrid_grid_size_get(Eo *eo_obj EINA_UNUSED, Evas_Textgrid_Data *o, int *w, int *h)
{
if (w) *w = o->cur.w;
if (h) *h = o->cur.h;
@ -1480,7 +1480,7 @@ _evas_textgrid_efl_object_dbg_info_get(Eo *eo_obj, Evas_Textgrid_Data *o EINA_UN
{
int w, h;
evas_obj_textgrid_size_get(eo_obj, &w, &h);
evas_obj_textgrid_grid_size_get(eo_obj, &w, &h);
node = EFL_DBG_INFO_LIST_APPEND(group, "Grid size");
EFL_DBG_INFO_APPEND(node, "w", EINA_VALUE_TYPE_INT, w);
EFL_DBG_INFO_APPEND(node, "h", EINA_VALUE_TYPE_INT, h);

10
src/lib/evas/canvas/evas_textgrid.eo
View File

@ -38,7 +38,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
styles: Evas.Textgrid.Font_Style; [[EVAS_TEXTGRID_FONT_STYLE_NORMAL]]
}
}
@property size {
@property grid_size {
set {
[[Set the size of the textgrid object.
@ -48,6 +48,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
function does nothing.
@since 1.7]]
legacy: evas_object_textgrid_size_set;
}
get {
[[Get the size of the textgrid object.
@ -58,6 +59,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
$null. On error, they are set to 0.
@since 1.7]]
legacy: evas_object_textgrid_size_get;
}
values {
w: int; [[The number of columns (width in cells) of the grid.]]
@ -90,7 +92,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
This function declares to evas that a region of cells was updated by
code and needs refreshing.
See also @.cellrow_set, @.cellrow_get and @.size.set.
See also @.cellrow_set, @.cellrow_get and @.grid_size.set.
@since 1.7]]
/* FIXME-doc
@ -121,7 +123,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
same row pointer returned by evas_object_textgrid_cellrow_get for the
same row $y.
See also @.cellrow_get, @.size.set and @.update_add.
See also @.cellrow_get, @.grid_size.set and @.update_add.
@since 1.7]]
@ -137,7 +139,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Font,
of the textgrid object $obj. If $y is not between 0 and the
number of lines of the grid - 1, or on error, this function return $null.
See also @.cellrow_set, @.size.set and @.update_add.
See also @.cellrow_set, @.grid_size.set and @.update_add.
@since 1.7]]
return: ptr(Evas.Textgrid.Cell); [[A pointer to the first cell of the given row.]]