diff options
author | Daniel Hirt <daniel.hirt@samsung.com> | 2014-07-24 16:08:35 +0300 |
---|---|---|
committer | Daniel Hirt <daniel.hirt@samsung.com> | 2014-07-27 11:09:46 +0300 |
commit | 3ec56173d5c6154db07696e69c76391223ad18b3 (patch) | |
tree | 0b5842623e9297c13aaf2d445ca03a73fedb07f6 | |
parent | b71f8a98a6fea336a1e0cc1d52c9109537725629 (diff) | |
download | efl-3ec56173d5c6154db07696e69c76391223ad18b3.tar.gz |
Evas Textblock: Add Enum for _layout_par return value
-rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index c87142f022..8f5f5b50d2 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -4897,14 +4897,21 @@ end: return ret; } +typedef enum +{ + EVAS_TEXTBLOCK_LAYOUT_PAR_OK, + EVAS_TEXTBLOCK_LAYOUT_PAR_ERR_NOBRK, + EVAS_TEXTBLOCK_LAYOUT_PAR_ERR_BRK +} Evas_Textblock_Layout_Par_Code; + /* 0 means go ahead, 1 means break without an error, 2 means * break with an error, should probably clean this a bit (enum/macro) * FIXME ^ */ -static int +static Evas_Textblock_Layout_Par_Code _layout_par_if_needed(Ctxt *c) { if (!c->par->logical_items) - return 2; + return EVAS_TEXTBLOCK_LAYOUT_PAR_ERR_BRK; /* We want to show it. */ c->par->visible = 1; @@ -4933,7 +4940,7 @@ _layout_par_if_needed(Ctxt *c) if (c->position == TEXTBLOCK_POSITION_START) c->position = TEXTBLOCK_POSITION_ELSE; - return 0; + return EVAS_TEXTBLOCK_LAYOUT_PAR_OK; } c->par->text_node->dirty = EINA_FALSE; c->par->text_node->is_new = EINA_FALSE; @@ -4964,7 +4971,10 @@ _layout_par_if_needed(Ctxt *c) } } - return (_layout_par(c) ? 1 : 0); + return (_layout_par(c) ? + EVAS_TEXTBLOCK_LAYOUT_PAR_ERR_NOBRK : + EVAS_TEXTBLOCK_LAYOUT_PAR_OK + ); } /** @@ -5366,7 +5376,7 @@ _layout_visual(Ctxt *c) _layout_update_par(c); /* Break if we should stop here. */ - if (_layout_par_if_needed(c)) + if (_layout_par_if_needed(c) != EVAS_TEXTBLOCK_LAYOUT_PAR_OK) { last_vis_par = c->par; break; |