rename activedisabled in xml to active-disabled
Dana Jansens danakj@orodu.net
2 files changed,
11 insertions(+),
9 deletions(-)
M
render/theme.c
→
render/theme.c
@@ -355,7 +355,7 @@ theme->menu_color = RrColorNew(inst, 0xff, 0xff, 0xff);
if (!FIND(color, L("menu","disabled","primary"), &theme->menu_disabled_color, NULL)) theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); - if (!FIND(color, L("menu","activedisabled","text","primary"), + if (!FIND(color, L("menu","active-disabled","text","primary"), &theme->menu_disabled_selected_color, NULL)) theme->menu_disabled_selected_color = RrColorNew(inst,@@ -420,7 +420,7 @@ theme->menu_text_normal_shadow_color->b);
theme->menu_text_disabled_shadow_alpha = theme->menu_text_normal_shadow_alpha; } - if (!FIND(color, L("menu","activedisabled","shadow","primary"), + if (!FIND(color, L("menu","active-disabled","shadow","primary"), &theme->menu_text_disabled_selected_shadow_color, &theme->menu_text_disabled_selected_shadow_alpha)) {@@ -583,7 +583,7 @@ if (!FIND(appearance, L("menu","title"), theme->a_menu_title, TRUE))
set_default_appearance(theme->a_menu_title); if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE)) set_default_appearance(theme->a_menu_selected); - if (!FIND(appearance, L("menu", "activedisabled"), + if (!FIND(appearance, L("menu", "active-disabled"), theme->a_menu_disabled_selected, TRUE)) theme->a_menu_disabled_selected = RrAppearanceCopy(theme->a_menu_selected);@@ -883,7 +883,7 @@ theme->a_menu_text_disabled))
theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_x = theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_y = 0; - if (!FIND(shadow, L("menu","activedisabled","shadow","offset"), + if (!FIND(shadow, L("menu","active-disabled","shadow","offset"), theme->a_menu_text_disabled_selected)) theme->a_menu_text_disabled_selected-> texture[0].data.text.shadow_offset_x = 0;
M
tools/themetoxml/themetoxml.c
→
tools/themetoxml/themetoxml.c
@@ -448,7 +448,7 @@ &i, &j, &k)) {
COLOR3("menu","disabled","primary",i,j,k,255); read_color(db, "menu.items.active.disabled.text.color", &i, &j, &k); /* read this if we can */ - COLOR4("menu","activedisabled","text","primary",i,j,k,255); + COLOR4("menu","active-disabled","text","primary",i,j,k,255); } if (read_color(db, "menu.items.active.text.color",@@ -465,7 +465,7 @@ APPEARANCE3("window.active.grip.bg", "window", "active", "grip");
APPEARANCE3("window.inactive.grip.bg", "window", "inactive", "grip"); APPEARANCE2("menu.items.bg", "menu", "entries"); APPEARANCE2("menu.items.active.bg", "menu", "active"); - APPEARANCE2("menu.items.active.bg", "menu", "activedisabled"); + APPEARANCE2("menu.items.active.bg", "menu", "active-disabled"); APPEARANCE2("menu.title.bg", "menu", "title"); APPEARANCE4("window.active.button.disabled.bg",@@ -565,8 +565,10 @@ ATTR5("menu","active","text","shadow","offset","x",NUM(i));
ATTR5("menu","active","text","shadow","offset","y",NUM(i)); ATTR4("menu","disabled","shadow","offset","x",NUM(i)); ATTR4("menu","disabled","shadow","offset","y",NUM(i)); - ATTR5("menu","activedisabled","text","shadow","offset","x",NUM(i)); - ATTR5("menu","activedisabled","text","shadow","offset","y",NUM(i)); + ATTR5("menu","active-disabled","text","shadow","offset","x", + NUM(i)); + ATTR5("menu","active-disabled","text","shadow","offset","y", + NUM(i)); } if ((p = strstr(s, "shadowtint="))) {@@ -576,7 +578,7 @@ i = ABS(i*255/100);
COLOR4("menu","inactive","shadow","primary",j,j,j,i); COLOR5("menu","active","text","shadow","primary",j,j,j,i); COLOR4("menu","disabled","shadow","primary",j,j,j,i); - COLOR5("menu","activedisabled","text","shadow","primary",j,j,j,i); + COLOR5("menu","active-disabled","text","shadow","primary",j,j,j,i); } }