dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edje/text - update text classes correctly if they are changed. 

SVN revision: 78741
This commit is contained in:
ChunEon Park 2012-11-01 06:18:10 +00:00
parent e12b7f2477
commit 3a99b1234e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/edje/ChangeLog
View File

@ -667,4 +667,7 @@
2012-10-31 Carsten Haitzler (The Rasterman) 2012-10-31 Carsten Haitzler (The Rasterman)
* Fix edje_cc to use max compression, not default compression. * Fix edje_cc to use max compression, not default compression.
2012-10-31 ChunEon Park (Hermet)
* Fix to update the text classes when text classes are changed.

1
legacy/edje/NEWS
View File

@ -26,6 +26,7 @@ Fixes:
* fix scale_set with edje containing boxes and/or tables * fix scale_set with edje containing boxes and/or tables
* fix scale_set with edje containing groups * fix scale_set with edje containing groups
* fix edje_cc to use max, not default compression * fix edje_cc to use max, not default compression
* fix edje_text_class_set to update the text classes correctly.
Edje 1.7.0 Edje 1.7.0

5
legacy/edje/src/lib/edje_util.c
View File

@ -964,9 +964,8 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
else else
{ {
/* Match and the same, return */ /* Match and the same, return */
if ((tc->size == size) || if (((tc->font && font) && !strcmp(tc->font, font)) &&
(tc->font == font) || (tc->size == size))
(tc->font && font && !strcmp(tc->font, font)))
return EINA_TRUE; return EINA_TRUE;
/* Update the class found */ /* Update the class found */