From 72e927e2ee6d029789362259ac78045eb804d8ac Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 16 Jul 2012 10:13:55 +0000 Subject: [PATCH] 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 --- src/bin/e_border.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 74ecb1afe..cd58d5f46 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -7472,13 +7472,21 @@ _e_border_eval0(E_Border *bd) ok = e_theme_edje_object_set(o, "base/theme/borders", buf); if ((!ok) && (strcmp(bd->client.border.name, "borderless"))) { - ok = e_theme_edje_object_set(o, "base/theme/borders", - "e/widgets/border/default/border"); - if (ok) + if (bd->client.border.name != e_config->theme_default_border_style) { - /* Reset default border style to default */ - eina_stringshare_replace(&e_config->theme_default_border_style, "default"); - e_config_save_queue(); + 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"); + if (ok) + { + /* Reset default border style to default */ + eina_stringshare_replace(&e_config->theme_default_border_style, "default"); + e_config_save_queue(); + } } }