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

diff --git a/data/ethumb/frames/border-0.jpg b/data/ethumb/frames/border-0.jpg
index ee66879..f076229 100644 (file)
Binary files a/data/ethumb/frames/border-0.jpg and b/data/ethumb/frames/border-0.jpg differ

diff --git a/data/ethumb/frames/default.edc b/data/ethumb/frames/default.edc
index 5341263..d7873ba 100644 (file)
--- a/data/ethumb/frames/default.edc
+++ b/data/ethumb/frames/default.edc
@@ -8,39 +8,30 @@ collections {
 
       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 65d3b97..8178c78 100644 (file)
--- 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
      {