From d8db6705ad3b8fc6688b186e0934ec91b6890bd8 Mon Sep 17 00:00:00 2001
From: Gustavo Sverzut Barbieri <barbieri@gmail.com>
Date: Sat, 12 Jan 2013 04:32:13 +0000
Subject: [PATCH] fix frame handling.

before it was confusing having to place the img behind the border and
draw a hole, it would also cut parts of the view doing that.



SVN revision: 82679
---
 data/ethumb/frames/border-0.jpg | Bin 542 -> 1147 bytes
 data/ethumb/frames/default.edc  |  35 ++++++++++++--------------------
 src/lib/ethumb/ethumb.c         |   8 ++------
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/data/ethumb/frames/border-0.jpg b/data/ethumb/frames/border-0.jpg
index ee66879b218900b9f9108871effdbfad1e33a52e..f076229ea9fc4b7ee9421731f15a46703c0820b9 100644
GIT binary patch
literal 1147
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!5PG(2>d_9z|FzXz|g?RD9G^t2!lA-L<VHQ
z#=`mk76S*+S_THjxAzhl+-{~au!Q~#U~r9pN)99E7z3v~&@Ooa1|~*Ukn>^IF|#oU
ziy0W3v9K~RLhWQ^WissjV_NL>Z0cF<S>Yz@GGi|7T#Ddk9DVtvPW=3SV|A<ApEE5l
zzdv*G-2A#Uzmngdjf$7wpE-H1-JdgaUVeX;^4uSfqA!N)>uSZ7-s}`lJ+WKQ^=6UY
z>4{}A-J71oPDc~0{m-!fgYSoWpa--B7#LWXxEYw3;XYtwW@TbAFg7hNoji5ZmW!7K
z6@`@y6QO=#vu6tF4CUzbIMK1V`}H^bFX7rV#glf%oY*aT>Y3|}b>T*OM~ik&EYqHP
zrh8+|x|G<ir^QNd@F?2wTf~^#Sw!btp|gnAu|Q`*Pra0sRPmFN@;4>xnXa$Ovnu~1
zdbw#w)K}l*e*YPob`^wk$F1D)^8SZ#Kdy(_SIuRu|8c!M7^7RY?D6vYgRvIct?NVX
zl)V3;y_~gR>#Ny)bN@52mONM|wl}!&^8N?w=7=7m(9k`G_QryfPEDM+%TsXTl=M$-
z@$+Ath<>wcN&k-RH%mR`3-dR<nq>Fre(F_~+N1kUuk!faT{}Hw;&-v%dMlOR>3)k1
za=$}_a{f%EZx>dr+Okt+R_2bAnlf3()%F;uGo|c*FB4en%>GUJ7bpQr3otS;F)_nZ
zA1HkbDl!-tIu^hZpS_}?VH-mO2Sb2NzFV)9Nyf#+VCvlW1;;8Z90HW>4)G`0Hhg2g
zfkCw>pZ8oK!qKVh_jk5g&dtqfXF=4)>mvILcuQY=hT6cuAn>2zKPUs@hK!(mDS(_$
zKrUt!G(b30faOT*))x*yVd;N=e}8{}e}5f_IvOSRD2gFz2Imd^^1b)ISKob)PThH7
c!*|<bo)D87lD7LhwjOVbnCR=$bo2jB0IFxrWdHyG

literal 542
zcmex=<NpH&0WUXCHwH#VMg|WcWcYuZ!I^=TnT3UgnH5N|va+(V^Kh^O0Y5i4CyyY%
zkdPq1prEjrjJU9fl&GMfgrbC$tgO7eys)^Eijtg)jGVmO{{sx%91IN%4UCL}4F8WX
zh=I*#KnAQFKyhUOMg|6EPLSm=z{JYN%pztMRyt+#B}PTZ|F;-8K(h7>HxqzLdSjn-
ze!E@qsxt-15nR1zqTTI$*+88J1_mb6@=5Bqb04o#odA?_TldN3ckZ52mrXzp$JKit
z^K-ZNt(fM(z`!WA`=s#OZ6B`+od8NHhgT}qZo6l-C=$qF$$GEizwP$%5N`z_k7iaG
zrs}Rtx$|1zO=sy=o!N6!UmTsXZRzCVHG3sCO}nxwuXOriv7lSie9vwAl5{FM=;Y38
zaXpdVS&`;er!RJE=6b6=kE|l!h)cfd!I#Us>`D_815V}U=Bj@C;K(9=+G0_c{<gxJ
SpP!$fpI=}1_xGRr|2F~D48%MD

diff --git a/data/ethumb/frames/default.edc b/data/ethumb/frames/default.edc
index 53412632c4..d7873bab41 100644
--- a/data/ethumb/frames/default.edc
+++ b/data/ethumb/frames/default.edc
@@ -7,40 +7,31 @@ collections {
       name: "frame/default";
 
       parts {
-         part {
-            name: "img";
-            type: SWALLOW;
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-            }
-         } // img
-
          part {
             name: "border";
             type: IMAGE;
             mouse_events: 0;
             description {
                state: "default" 0.0;
-               color: 224 224 224 255;
-               rel1 {
-                  to: "img";
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-               }
-               rel2 {
-                  to: "img";
-                  relative: 1.0 1.0;
-                  offset: -1 -1;
-               }
                image {
                   normal: "border-0.jpg";
                   border: 2 2 2 2;
-                  middle: 0;
                }
+               rel1.offset: -2 -2;
+               rel2.offset: 1 1;
             }
-         } // border
+         }
 
+         part {
+            name: "img";
+            type: SWALLOW;
+            mouse_events: 0;
+            description {
+               state: "default" 0.0;
+               rel1.offset: 2 2;
+               rel2.offset: -3 -3;
+            }
+         }
       }
    }
 }
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index 65d3b97c84..8178c78578 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -1240,11 +1240,9 @@ ethumb_plugin_image_resize(Ethumb *e, int w, int h)
 
    if (e->frame)
      {
-        edje_extern_object_min_size_set(img, w, h);
-        edje_extern_object_max_size_set(img, w, h);
-        edje_object_calc_force(e->frame->edje);
         evas_object_move(e->frame->edje, 0, 0);
         evas_object_resize(e->frame->edje, w, h);
+        edje_object_calc_force(e->frame->edje);
      }
    else
      {
@@ -1514,11 +1512,9 @@ _ethumb_image_load(Ethumb *e)
 
    if (e->frame)
      {
-        edje_extern_object_min_size_set(img, ww, hh);
-        edje_extern_object_max_size_set(img, ww, hh);
-        edje_object_calc_force(e->frame->edje);
         evas_object_move(e->frame->edje, 0, 0);
         evas_object_resize(e->frame->edje, ww, hh);
+        edje_object_calc_force(e->frame->edje);
      }
    else
      {