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

edje/text - trivial change (typo, indent)

This commit is contained in:
ChunEon Park 2013-05-22 16:49:43 +09:00
parent 7cdda677de
commit f45f2ef0ae
2 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/edje/edje_text.c
View File

@ -112,7 +112,6 @@ _edje_text_font_get(const char *base, const char *new, char **free_later)
return base; return base;
else if (!base) else if (!base)
return new; return new;
base_style = strstr(base, ":style="); base_style = strstr(base, ":style=");
if (!base_style) if (!base_style)
return new; return new;

136
src/lib/edje/edje_textblock_styles.c
View File

@ -152,7 +152,7 @@ _edje_format_reparse(Edje_File *edf, const char *str, Edje_Style_Tag **tag_ret)
/* Update all evas_styles which are in an edje /* Update all evas_styles which are in an edje
* *
* @param ed The edje containing styles which need to be updated * @param ed The edje containing styles which need to be updated
*/ */
void void
_edje_textblock_style_all_update(Edje *ed) _edje_textblock_style_all_update(Edje *ed)
@ -165,16 +165,16 @@ _edje_textblock_style_all_update(Edje *ed)
EINA_LIST_FOREACH(ed->file->styles, l, stl) EINA_LIST_FOREACH(ed->file->styles, l, stl)
{ {
Edje_Style_Tag *tag; Edje_Style_Tag *tag;
Edje_Text_Class *tc; Edje_Text_Class *tc;
int found = 0; int found = 0;
char *fontset = NULL, *fontsource = NULL; char *fontset = NULL, *fontsource = NULL;
/* Make sure the style is already defined */ /* Make sure the style is already defined */
if (!stl->style) break; if (!stl->style) break;
/* Make sure the style contains a text_class */ /* Make sure the style contains a text_class */
EINA_LIST_FOREACH(stl->tags, ll, tag) EINA_LIST_FOREACH(stl->tags, ll, tag)
{ {
if (tag->text_class) if (tag->text_class)
{ {
@ -183,75 +183,79 @@ _edje_textblock_style_all_update(Edje *ed)
} }
} }
/* No text classes , goto next style */ /* No text classes , goto next style */
if (!found) continue; if (!found) continue;
if (!txt) if (!txt)
txt = eina_strbuf_new(); txt = eina_strbuf_new();
if (_edje_fontset_append) if (_edje_fontset_append)
fontset = eina_str_escape(_edje_fontset_append); fontset = eina_str_escape(_edje_fontset_append);
fontsource = eina_str_escape(ed->file->path); fontsource = eina_str_escape(ed->file->path);
/* Build the style from each tag */ /* Build the style from each tag */
EINA_LIST_FOREACH(stl->tags, ll, tag) EINA_LIST_FOREACH(stl->tags, ll, tag)
{ {
if (!tag->key) continue; if (!tag->key) continue;
/* Add Tag Key */ /* Add Tag Key */
eina_strbuf_append(txt, tag->key); eina_strbuf_append(txt, tag->key);
eina_strbuf_append(txt, "='"); eina_strbuf_append(txt, "='");
/* Configure fonts from text class if it exists */ /* Configure fonts from text class if it exists */
tc = _edje_text_class_find(ed, tag->text_class); tc = _edje_text_class_find(ed, tag->text_class);
/* Add and Ha`ndle tag parsed data */ /* Add and Handle tag parsed data */
eina_strbuf_append(txt, tag->value); eina_strbuf_append(txt, tag->value);
if (!strcmp(tag->key, "DEFAULT")) if (!strcmp(tag->key, "DEFAULT"))
{ {
if (fontset) if (fontset)
{ {
eina_strbuf_append(txt, " "); eina_strbuf_append(txt, " ");
eina_strbuf_append(txt, "font_fallbacks="); eina_strbuf_append(txt, "font_fallbacks=");
eina_strbuf_append(txt, fontset); eina_strbuf_append(txt, fontset);
} }
eina_strbuf_append(txt, " "); eina_strbuf_append(txt, " ");
eina_strbuf_append(txt, "font_source="); eina_strbuf_append(txt, "font_source=");
eina_strbuf_append(txt, fontsource); eina_strbuf_append(txt, fontsource);
} }
if (tag->font_size != 0) if (tag->font_size != 0)
{ {
char font_size[32]; char font_size[32];
if (tc && tc->size) if (tc && tc->size)
snprintf(font_size, sizeof(font_size), "%f", (double) _edje_text_size_calc(tag->font_size, tc)); snprintf(font_size, sizeof(font_size), "%f",
else (double) _edje_text_size_calc(tag->font_size, tc));
snprintf(font_size, sizeof(font_size), "%f", tag->font_size); else
snprintf(font_size, sizeof(font_size), "%f",
tag->font_size);
eina_strbuf_append(txt, " "); eina_strbuf_append(txt, " ");
eina_strbuf_append(txt, "font_size="); eina_strbuf_append(txt, "font_size=");
eina_strbuf_append(txt, font_size); eina_strbuf_append(txt, font_size);
} }
/* Add font name last to save evas from multiple loads */ /* Add font name last to save evas from multiple loads */
if (tag->font) if (tag->font)
{ {
const char *f; const char *f;
eina_strbuf_append(txt, " "); eina_strbuf_append(txt, " ");
eina_strbuf_append(txt, "font="); eina_strbuf_append(txt, "font=");
f = (tc && tc->font) ? tc->font : tag->font; f = (tc && tc->font) ? tc->font : tag->font;
eina_strbuf_append_escaped(txt, f); if (tc && tc->font) printf("tc font = %s\n", tc->font);
} if (tag->font) printf("tag font = %s\n", tag->font);
eina_strbuf_append_escaped(txt, f);
}
eina_strbuf_append(txt, "'"); eina_strbuf_append(txt, "'");
} }
if (fontset) free(fontset); if (fontset) free(fontset);
if (fontsource) free(fontsource); if (fontsource) free(fontsource);
/* Configure the style */ /* Configure the style */
evas_textblock_style_set(stl->style, eina_strbuf_string_get(txt)); evas_textblock_style_set(stl->style, eina_strbuf_string_get(txt));
eina_strbuf_reset(txt); eina_strbuf_reset(txt);
} }
if (txt) if (txt)
eina_strbuf_free(txt); eina_strbuf_free(txt);