vtorri
/
edi
forked from enlightenment/edi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up headers and tests to remove the exposure of some private methods. 

Add some documentation whilst we're there too
This commit is contained in:
Andy Williams 2014-12-05 09:39:40 -06:00
parent d9c5fe08b9
commit 4e0b183f34
4 changed files with 59 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
elm_code/lib/elm_code_widget.c
View File

@ -23,7 +23,8 @@ Eina_Unicode status_icons[] = {
0
};
static Eina_Bool _elm_code_widget_resize(Evas_Object *o)
static Eina_Bool
_elm_code_widget_resize(Evas_Object *o)
{
int w, h, cw, ch;
@ -35,7 +36,8 @@ static Eina_Bool _elm_code_widget_resize(Evas_Object *o)
return h > 0 && w > 0;
}
static void _elm_code_widget_fill_line_token(Evas_Textgrid_Cell *cells, int count, int start, int end, Elm_Code_Token_Type type)
static void
_elm_code_widget_fill_line_token(Evas_Textgrid_Cell *cells, int count, int start, int end, Elm_Code_Token_Type type)
{
int x;
@ -45,7 +47,8 @@ static void _elm_code_widget_fill_line_token(Evas_Textgrid_Cell *cells, int coun
}
}
EAPI void elm_code_widget_fill_line_tokens(Evas_Textgrid_Cell *cells, unsigned int count, Elm_Code_Line *line)
static void
_elm_code_widget_fill_line_tokens(Evas_Textgrid_Cell *cells, unsigned int count, Elm_Code_Line *line)
{
Eina_List *item;
Elm_Code_Token *token;
@ -68,7 +71,8 @@ EAPI void elm_code_widget_fill_line_tokens(Evas_Textgrid_Cell *cells, unsigned i
_elm_code_widget_fill_line_token(cells, count, start, length, ELM_CODE_TOKEN_TYPE_DEFAULT);
}
static void _elm_code_widget_fill_line(Evas_Object *o, Evas_Textgrid_Cell *cells, Elm_Code_Line *line)
static void
_elm_code_widget_fill_line(Evas_Object *o, Evas_Textgrid_Cell *cells, Elm_Code_Line *line)
{
char *chr;
unsigned int length, x;
@ -103,7 +107,7 @@ static void _elm_code_widget_fill_line(Evas_Object *o, Evas_Textgrid_Cell *cells
cells[x].bg = line->status;
}
elm_code_widget_fill_line_tokens(cells, w, line);
_elm_code_widget_fill_line_tokens(cells, w, line);
if (widget->editable && widget->cursor_line == line->number)
{
if (widget->cursor_col < (unsigned int) w)
@ -113,7 +117,8 @@ static void _elm_code_widget_fill_line(Evas_Object *o, Evas_Textgrid_Cell *cells
evas_object_textgrid_update_add(o, 0, line->number - 1, w, 1);
}
EAPI void elm_code_widget_fill(Evas_Object *o, Elm_Code *code)
static void
_elm_code_widget_fill(Evas_Object *o, Elm_Code *code)
{
Elm_Code_Line *line;
Evas_Textgrid_Cell *cells;
@ -168,7 +173,7 @@ _elm_code_widget_file_cb(void *data, Eo *obj, const Eo_Event_Description *desc E
code = (Elm_Code *)data;
o = (Evas_Object *)obj;
elm_code_widget_fill(o, code);
_elm_code_widget_fill(o, code);
return EINA_TRUE;
}
@ -180,10 +185,11 @@ _elm_code_widget_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
code = (Elm_Code *)data;
elm_code_widget_fill(obj, code);
_elm_code_widget_fill(obj, code);
}
EAPI Evas_Object *elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
EAPI Evas_Object *
elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
{
Evas_Object *o;
Elm_Code_Widget *widget;
@ -240,7 +246,8 @@ EAPI Evas_Object *elm_code_widget_add(Evas_Object *parent, Elm_Code *code)
return o;
}
EAPI void elm_code_widget_font_size_set(Evas_Object *obj, Evas_Font_Size size)
EAPI void
elm_code_widget_font_size_set(Evas_Object *obj, Evas_Font_Size size)
{
ELM_CODE_WIDGET_DATA_GET(obj, widget);
@ -248,7 +255,8 @@ EAPI void elm_code_widget_font_size_set(Evas_Object *obj, Evas_Font_Size size)
evas_object_textgrid_font_set(obj, "Mono", size * elm_config_scale_get());
}
EAPI void elm_code_widget_editable_set(Evas_Object *obj, Eina_Bool editable)
EAPI void
elm_code_widget_editable_set(Evas_Object *obj, Eina_Bool editable)
{
ELM_CODE_WIDGET_DATA_GET(obj, widget);

40
elm_code/lib/elm_code_widget.h
View File

@ -50,14 +50,46 @@ typedef struct _Elm_Code_Widget
EAPI Evas_Object *elm_code_widget_add(Evas_Object *parent, Elm_Code *code);
/**
* @}
*
* @brief UI Manipulation functions.
* @defgroup UI Manage aspects of an Elm_Code widget
*
* @{
*
* Functions for UI manipulation.
*
*/
/**
* Set the font size of a widget
*
* Change the size of the monospaced font used by this widget instance.
* 10 pt is the default font size for an elm_code widget.
*
* @param widget The widget to change
* @param size The font size to set on this widget
*
* @ingroup UI
*/
EAPI void elm_code_widget_font_size_set(Evas_Object *widget, Evas_Font_Size size);
/**
* Set this widget to be editable
*
* An editable widget displays a cursor and accepts user input.
* It will also accept focus.
* If EINA_FALSE is passed this widget will return to being read-only.
* EINA_FALSE is the default value for editable.
*
* @param widget The widget to change
* @param editable Whether or not this widget should be editable
*
* @ingroup UI
*/
EAPI void elm_code_widget_editable_set(Evas_Object *widget, Eina_Bool editable);
EAPI void elm_code_widget_fill(Evas_Object *o, Elm_Code *code);
EAPI void elm_code_widget_fill_line_tokens(Evas_Textgrid_Cell *cells, unsigned int count, Elm_Code_Line *line);
/**
* @}
*/

4
elm_code/tests/elm_code_test_widget.c
View File

@ -4,6 +4,8 @@
#include "elm_code_suite.h"
#include "elm_code_widget.c"
static void _assert_cell_type(Evas_Textgrid_Cell cell, Elm_Code_Token_Type type, int id)
{
ck_assert_msg(cell.fg == type, "Wrong type for cell %d", id);
@ -27,7 +29,7 @@ START_TEST (elm_code_widget_token_render_simple_test)
elm_code_file_line_token_add(file, 1, 6+1, 17+1, ELM_CODE_TOKEN_TYPE_COMMENT);
elm_code_file_line_token_add(file, 1, 21+1, 22+1, ELM_CODE_TOKEN_TYPE_COMMENT);
elm_code_widget_fill_line_tokens(cells, length+1, line);
_elm_code_widget_fill_line_tokens(cells, length+1, line);
_assert_cell_type(cells[1], ELM_CODE_TOKEN_TYPE_DEFAULT, 1);
_assert_cell_type(cells[4], ELM_CODE_TOKEN_TYPE_DEFAULT, 4);
_assert_cell_type(cells[6], ELM_CODE_TOKEN_TYPE_DEFAULT, 6);

2
src/tests/edi_test_content_provider.c
View File

@ -7,7 +7,7 @@
#include "edi_suite.h"
// Add some no-op methods here so linking works without having to import the whole UI!
EAPI Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
EAPI Evas_Object *edi_editor_add(Evas_Object *parent EINA_UNUSED, Edi_Mainview_Item *item EINA_UNUSED)
{
return NULL;
}