enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

fix some native size stuff... 

SVN revision: 13434
This commit is contained in:
Carsten Haitzler 2005-02-19 05:07:11 +00:00
parent 76d51ef015
commit bd399b7aaa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -177,6 +177,7 @@ evas_object_textblock_layout_init(Layout *layout)
layout->line.advance = 0;
layout->align = 0.0;
layout->valign = -1.0;
layout->style = STYLE_PLAIN;
layout->word_wrap = 0;
layout->underline = 0;
layout->second_underline = 0;
@ -836,7 +837,10 @@ evas_object_textblock_layout_internal(Evas_Object *obj, int w, int h, int *forma
fw = layout.line.x + hadvance;
layout.line.x += hadvance;
lnode->layout.line.advance = hadvance;
if (layout.line.x >= ww) goto newline;
if (w > 0)
{
if (layout.line.x >= ww) goto newline;
}
}
else
{
@ -1178,6 +1182,7 @@ evas_object_textblock_native_calc(Evas_Object *obj)
o->native.w = fw;
o->native.h = fh;
o->native.lines = lines;
o->native.dirty = 0;
}
static Node *