fix weird border behavior where it would reset to the default style any time a non-existing style was passed without trying the currently-set theme style

ticket #1163


SVN revision: 73917
This commit is contained in:
Mike Blumenkrantz 2012-07-16 10:13:55 +00:00
parent fb297732a5
commit 72e927e2ee
1 changed files with 14 additions and 6 deletions

View File

@ -7471,6 +7471,13 @@ _e_border_eval0(E_Border *bd)
snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name);
ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
if ((!ok) && (strcmp(bd->client.border.name, "borderless")))
{
if (bd->client.border.name != e_config->theme_default_border_style)
{
snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", e_config->theme_default_border_style);
ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
}
if (!ok)
{
ok = e_theme_edje_object_set(o, "base/theme/borders",
"e/widgets/border/default/border");
@ -7481,6 +7488,7 @@ _e_border_eval0(E_Border *bd)
e_config_save_queue();
}
}
}
bd->shaped = 0;
if (ok)