forked from enlightenment/efl
Evas: Fixed a bug with breaking after format items.
SVN revision: 82653
This commit is contained in:
parent
88ab486e63
commit
e84686d76d
|
@ -1,6 +1,7 @@
|
||||||
2013-01-11 Tom Hacohen (TAsn)
|
2013-01-11 Tom Hacohen (TAsn)
|
||||||
|
|
||||||
* Static libs: Updated liblinebreak to libunibreak's latest version.
|
* Static libs: Updated liblinebreak to libunibreak's latest version.
|
||||||
|
* Evas texblock: Fixed a bug with breaking after format items.
|
||||||
|
|
||||||
2013-01-11 Cedric Bail
|
2013-01-11 Cedric Bail
|
||||||
|
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -108,3 +108,4 @@ Fixes:
|
||||||
* Fix eina_prefix_new() with debian multilib without magic check file.
|
* Fix eina_prefix_new() with debian multilib without magic check file.
|
||||||
* Fix evas bmp loader code which deal with image size.
|
* Fix evas bmp loader code which deal with image size.
|
||||||
* Fix not up to date clip cache for Evas_Object_Text.
|
* Fix not up to date clip cache for Evas_Object_Text.
|
||||||
|
* Evas texblock: Fixed a bug with breaking after format items.
|
||||||
|
|
|
@ -4043,7 +4043,7 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ((wrap < len) && (wrap > line_start))
|
if ((wrap < len) && (wrap >= line_start))
|
||||||
{
|
{
|
||||||
MOVE_NEXT_UNTIL(len, wrap);
|
MOVE_NEXT_UNTIL(len, wrap);
|
||||||
return wrap;
|
return wrap;
|
||||||
|
@ -4454,10 +4454,13 @@ _layout_par(Ctxt *c)
|
||||||
item_pos as the line_start, because
|
item_pos as the line_start, because
|
||||||
there's already no cut before*/
|
there's already no cut before*/
|
||||||
wrap = -1;
|
wrap = -1;
|
||||||
|
adv_line = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
wrap -= it->text_pos; /* Cut here */
|
{
|
||||||
|
wrap -= it->text_pos; /* Cut here */
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wrap > 0)
|
if (wrap > 0)
|
||||||
|
|
Loading…
Reference in New Issue