tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=dd6bb93ba0895bc49ede382a908bb33eee1574e1
commit dd6bb93ba0895bc49ede382a908bb33eee1574e1 Author: Tom Hacohen <t...@stosb.com> Date: Mon Jun 1 11:33:59 2015 +0100 Evas textgrid: Migrate types to .eo files. --- src/lib/evas/Evas_Common.h | 38 ------------------------------------ src/lib/evas/canvas/evas_textgrid.eo | 31 ++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 757bd78..de55870 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -3990,44 +3990,6 @@ EAPI Eina_Bool evas_textblock_cursor_eol_get(cons */ /** - * @typedef Evas_Textgrid_Palette - * - * The palette to use for the foreground and background colors. - * - * @since 1.7 - */ -typedef enum -{ - EVAS_TEXTGRID_PALETTE_NONE, /**< No palette is used */ - EVAS_TEXTGRID_PALETTE_STANDARD, /**< standard palette (around 16 colors) */ - EVAS_TEXTGRID_PALETTE_EXTENDED, /**< extended palette (at max 256 colors) */ - EVAS_TEXTGRID_PALETTE_LAST /**< ignore it */ -} Evas_Textgrid_Palette; - -/** - * @typedef Evas_Textgrid_Font_Style - * - * The style to give to each character of the grid. - * - * @since 1.7 - */ -typedef enum -{ - EVAS_TEXTGRID_FONT_STYLE_NORMAL = (1 << 0), /**< Normal style */ - EVAS_TEXTGRID_FONT_STYLE_BOLD = (1 << 1), /**< Bold style */ - EVAS_TEXTGRID_FONT_STYLE_ITALIC = (1 << 2) /**< Oblique style */ -} Evas_Textgrid_Font_Style; - -/** - * @typedef Evas_Textgrid_Cell - * - * The values that describes each cell. - * - * @since 1.7 - */ -typedef struct _Evas_Textgrid_Cell Evas_Textgrid_Cell; - -/** * @struct _Evas_Textgrid_Cell * * The values that describes each cell. diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index 0281176..b6fa285 100644 --- a/src/lib/evas/canvas/evas_textgrid.eo +++ b/src/lib/evas/canvas/evas_textgrid.eo @@ -1,3 +1,24 @@ +enum Evas.Textgrid.Palette { + /*@ The palette to use for the foreground and background colors. + @since 1.7 */ + none, /**< No palette is used */ + standard, /**< standard palette (around 16 colors) */ + extended, /**< extended palette (at max 256 colors) */ + last /**< ignore it */ +} + +enum Evas.Textgrid.Font_Style { + /*@ * The style to give to each character of the grid. + * @since 1.7 + */ + normal = (1 << 0), /**< Normal style */ + bold = (1 << 1), /**< Bold style */ + italic = (1 << 2) /**< Oblique style */ +} + +/* XXX: Acutal definition is in C. */ +struct Evas.Textgrid.Cell; + class Evas.Textgrid (Evas.Object, Efl.Text_Properties) { legacy_prefix: evas_object_textgrid; @@ -14,7 +35,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties) @return EVAS_TEXTGRID_FONT_STYLE_NORMAL */ } values { - styles: Evas_Textgrid_Font_Style; + styles: Evas.Textgrid.Font_Style; } } @property size { @@ -116,7 +137,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties) params { @in y: int; /*@ The row index of the grid. */ - @in row: const(Evas_Textgrid_Cell)*; /*@ The string as a sequence of #Evas_Textgrid_Cell. */ + @in row: const(Evas.Textgrid.Cell)*; /*@ The string as a sequence of #Evas_Textgrid_Cell. */ } } cellrow_get @const { @@ -134,7 +155,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties) @see evas_object_textgrid_update_add() @since 1.7 */ - return: Evas_Textgrid_Cell*; + return: Evas.Textgrid.Cell*; params { @in y: int; /*@ The row index of the grid. */ } @@ -159,7 +180,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties) @since 1.7 */ params { - @in pal: Evas_Textgrid_Palette; /*@ The type of the palette to set the color. */ + @in pal: Evas.Textgrid.Palette; /*@ The type of the palette to set the color. */ @in idx: int; /*@ The index of the paletter to which the color is stored. */ @in r: int; /*@ The red component of the color. */ @in g: int; /*@ The green component of the color. */ @@ -183,7 +204,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties) @since 1.7 */ params { - @in pal: Evas_Textgrid_Palette; /*@ The type of the palette to set the color. */ + @in pal: Evas.Textgrid.Palette; /*@ The type of the palette to set the color. */ @in idx: int; /*@ The index of the palette to which the color is stored. */ @out r: int; /*@ A pointer to the red component of the color. */ @out g: int; /*@ A pointer to the green component of the color. */ --