forked from enlightenment/enlightenment
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:
parent
fb297732a5
commit
72e927e2ee
|
@ -7471,6 +7471,13 @@ _e_border_eval0(E_Border *bd)
|
||||||
snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name);
|
snprintf(buf, sizeof(buf), "e/widgets/border/%s/border", bd->client.border.name);
|
||||||
ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
|
ok = e_theme_edje_object_set(o, "base/theme/borders", buf);
|
||||||
if ((!ok) && (strcmp(bd->client.border.name, "borderless")))
|
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",
|
ok = e_theme_edje_object_set(o, "base/theme/borders",
|
||||||
"e/widgets/border/default/border");
|
"e/widgets/border/default/border");
|
||||||
|
@ -7481,6 +7488,7 @@ _e_border_eval0(E_Border *bd)
|
||||||
e_config_save_queue();
|
e_config_save_queue();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bd->shaped = 0;
|
bd->shaped = 0;
|
||||||
if (ok)
|
if (ok)
|
||||||
|
|
Loading…
Reference in New Issue