Evas obj text: Fix an issue with horiz_advance_get func.
SVN revision: 82800
This commit is contained in:
parent
e183866d21
commit
c089f174ca
|
@ -1,6 +1,7 @@
|
||||||
2013-01-15 Tom Hacohen (TAsn)
|
2013-01-15 Tom Hacohen (TAsn)
|
||||||
|
|
||||||
* Evas textblock: Fixed issue and simplified cursor_geometry_get.
|
* Evas textblock: Fixed issue and simplified cursor_geometry_get.
|
||||||
|
* Evas text: Fixed issue with horiz advance.
|
||||||
|
|
||||||
2013-01-14 Daniel Willmann
|
2013-01-14 Daniel Willmann
|
||||||
|
|
||||||
|
|
1
NEWS
1
NEWS
|
@ -114,3 +114,4 @@ Fixes:
|
||||||
* Evas textblock: Fixed issue with line height when breaking on a format.
|
* Evas textblock: Fixed issue with line height when breaking on a format.
|
||||||
* Fix SIGFPE in evas map update if image is 0.
|
* Fix SIGFPE in evas map update if image is 0.
|
||||||
* Evas textblock: Fixed issue and simplified cursor_geometry_get.
|
* Evas textblock: Fixed issue and simplified cursor_geometry_get.
|
||||||
|
* Evas text: Fixed issue with horiz advance.
|
||||||
|
|
|
@ -306,7 +306,7 @@ static Evas_Coord
|
||||||
_evas_object_text_horiz_advance_get(const Evas_Object *eo_obj,
|
_evas_object_text_horiz_advance_get(const Evas_Object *eo_obj,
|
||||||
const Evas_Object_Text *o)
|
const Evas_Object_Text *o)
|
||||||
{
|
{
|
||||||
Evas_Object_Text_Item *it, *last_it = NULL;
|
Evas_Object_Text_Item *it;
|
||||||
Evas_Coord adv;
|
Evas_Coord adv;
|
||||||
(void) eo_obj;
|
(void) eo_obj;
|
||||||
|
|
||||||
|
@ -314,11 +314,8 @@ _evas_object_text_horiz_advance_get(const Evas_Object *eo_obj,
|
||||||
EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
|
EINA_INLIST_FOREACH(EINA_INLIST_GET(o->items), it)
|
||||||
{
|
{
|
||||||
adv += it->adv;
|
adv += it->adv;
|
||||||
last_it = it;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (last_it && (last_it->w > last_it->adv))
|
|
||||||
adv += last_it->w - last_it->adv;
|
|
||||||
return adv;
|
return adv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue