From: raster <raster>
Date: Mon, 10 Oct 2011 07:58:14 +0000 (+0000)
Subject: and actually always apply border_scale_by directly as-is even if
X-Git-Tag: submit/2.0alpha-wayland/20121127.221958~637
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2596a9e6d0421530a8ff3d2aa2add28667ac4ffd;p=profile%2Fivi%2Fedje.git

and actually always apply border_scale_by directly as-is even if
border_scale is not set.



git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@63944 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
index 1b8a21a..2ee6180 100644
--- a/src/lib/edje_calc.c
+++ b/src/lib/edje_calc.c
@@ -1886,7 +1886,13 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
            evas_object_image_border_scale_set(ep->object, TO_DOUBLE(sc));
      }
    else
-     evas_object_image_border_scale_set(ep->object, 1.0);
+     {
+        if (chosen_desc->image.border.scale_by > FROM_DOUBLE(0.0))
+           evas_object_image_border_scale_set
+           (ep->object, TO_DOUBLE(chosen_desc->image.border.scale_by));
+        else
+           evas_object_image_border_scale_set(ep->object, 1.0);
+     }
    evas_object_image_border_set(ep->object, p3->type.common.spec.image.l, p3->type.common.spec.image.r,
 				p3->type.common.spec.image.t, p3->type.common.spec.image.b);
    if (chosen_desc->image.border.no_fill == 0)