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

Some more text classes now supported. We clearly need more later, 

maybe wrapping unbounded ones into a "general" TC.
TC swithing exposes various widgets bugs WRT layouting of children
objects, we gotta fix them.



SVN revision: 54715
This commit is contained in:
Gustavo Lima Chaves 2010-11-19 09:37:33 +00:00
parent 9d6fcdc04d
commit 85cc0b3b01
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
legacy/elementary/data/themes/default.edc
View File

@ -1394,7 +1394,7 @@ collections {
data.item: "max_font_size" "60";
styles {
style { name: "textblock_style";
base: "font=Sans font_size=10 color=#000 wrap=word";
base: "font=Sans font_size=10 color=#000 wrap=word text_class=label";
tag: "br" "\n";
tag: "ps" "ps";
tag: "hilight" "+ font=Sans:style=Bold";
@ -1458,7 +1458,7 @@ collections {
data.item: "max_font_size" "60";
styles {
style { name: "textblock_style2";
base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word";
base: "font=Sans:style=Bold font_size=10 align=center color=#fff wrap=word text_class=label";
tag: "br" "\n";
tag: "ps" "ps";
tag: "hilight" "+ color=#ffff";
@ -4050,6 +4050,7 @@ collections {
size: 10;
min: 1 1;
align: 0.0 0.5;
text_class: "menu";
}
}
description { state: "visible" 0.0;
@ -4412,6 +4413,7 @@ collections {
size: 10;
min: 1 1;
align: 0.0 0.5;
text_class: "menu";
}
}
description { state: "visible" 0.0;
@ -8120,7 +8122,7 @@ collections {
styles
{
style { name: "entry_textblock_style";
base: "font=Sans font_size=10 color=#000 wrap=word";
base: "font=Sans font_size=10 color=#000 wrap=word text_class=entry";
tag: "br" "\n";
tag: "ps" "ps";
tag: "tab" "\t";
@ -8130,7 +8132,7 @@ collections {
tag: "hilight" "+ font=Sans:style=Bold";
}
style { name: "entry_textblock_disabled_style";
base: "font=Sans font_size=10 color=#00000080 wrap=word";
base: "font=Sans font_size=10 color=#00000080 wrap=word text_class=entry";
tag: "br" "\n";
tag: "ps" "ps";
tag: "tab" "\t";
@ -8200,7 +8202,7 @@ collections {
styles
{
style { name: "entry_textblock_style_charwrap";
base: "font=Sans font_size=10 color=#000 wrap=char";
base: "font=Sans font_size=10 color=#000 wrap=char text_class=entry";
tag: "br" "\n";
tag: "ps" "ps";
tag: "tab" "\t";
@ -8210,7 +8212,7 @@ collections {
tag: "hilight" "+ font=Sans:style=Bold";
}
style { name: "entry_textblock_disabled_style_charwrap";
base: "font=Sans font_size=10 color=#00000080 wrap=char";
base: "font=Sans font_size=10 color=#00000080 wrap=char text_class=entry";
tag: "br" "\n";
tag: "ps" "ps";
tag: "tab" "\t";
@ -8355,7 +8357,7 @@ collections {
styles
{
style { name: "entry_single_textblock_style";
base: "font=Sans font_size=10 color=#000 wrap=none";
base: "font=Sans font_size=10 color=#000 wrap=none text_class=entry";
tag: "br" "\n";
tag: "ps" "ps";
tag: "tab" "\t";
@ -8365,7 +8367,7 @@ collections {
tag: "hilight" "+ font=Sans:style=Bold";
}
style { name: "entry_single_textblock_disabled_style";
base: "font=Sans font_size=10 color=#00000080 wrap=none";
base: "font=Sans font_size=10 color=#00000080 wrap=none text_class=entry";
tag: "br" "\n";
tag: "ps" "ps";
tag: "tab" "\t";
@ -31992,6 +31994,7 @@ collections {
size: 12;
min: 0 0;
align: 0.5 0.5;
text_class: "title_bar";
}
}
}

23
legacy/elementary/src/lib/elm_config.c
View File

@ -34,27 +34,10 @@ const char *_elm_engines[] = {
declare it both here and in the (default) theme */
static const Elm_Text_Class _elm_text_classes[] = {
{"button", "Button Labels"},
/* FIXME: put in the right/definitive font classes */
{"label", "Text Labels"},
{"entry", "Text Entries"},
{"title_bar", "Title Bar"},
{"menu_item", "Menu Item"},
{"menu_title", "Menu Title"},
{"tb_plain", "Textblock Plain"},
{"tb_light", "Textblock Light"},
{"tb_big", "Textblock Big"},
{"move_text", "Move Text"},
{"resize_text", "Resize Text"},
{"winlist_title", "Winlist Title"},
{"configure", "Settings Heading"},
{"about_title", "About Title"},
{"about_version", "About Version"},
{"desklock_title", "Desklock Title"},
{"desklock_passwd", "Desklock Password"},
{"dialog_error", "Dialog Error"},
{"exebuf_command", "Exebuf Command"},
{"init_title", "Splash Title"},
{"init_text", "Splash Text"},
{"init_version", "Splash Version"},
{"menu", "Menu Items"},
{NULL, NULL}
};