diff --git a/data/ethumb/frames/border-0.jpg b/data/ethumb/frames/border-0.jpg index ee66879b21..f076229ea9 100644 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 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 {