raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ba5e3ec2fbeb3638175bb400503193ff954e04be
commit ba5e3ec2fbeb3638175bb400503193ff954e04be Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Wed Jul 20 11:34:01 2016 +0900 evas objkect image - make opaque rect getting code more readable this just makes it more obvious where its handling the opaque middle fill case. see T4123 - i was just reding the code and this seemingly does the right thing. --- src/lib/evas/canvas/evas_object_image.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index ad7810a..c68c866 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -3063,12 +3063,7 @@ evas_object_image_get_opaque_rect(Evas_Object *eo_obj EINA_UNUSED, *w = obj->cur->geometry.w; *h = obj->cur->geometry.h; } - else if (o->cur->border.fill != EVAS_BORDER_FILL_SOLID) - { - *w = 0; - *h = 0; - } - else + else if (o->cur->border.fill == EVAS_BORDER_FILL_SOLID) { *x = obj->cur->geometry.x + (o->cur->border.l * o->cur->border.scale); *y = obj->cur->geometry.y + (o->cur->border.t * o->cur->border.scale); @@ -3079,6 +3074,11 @@ evas_object_image_get_opaque_rect(Evas_Object *eo_obj EINA_UNUSED, + (o->cur->border.b * o->cur->border.scale)); if (*h < 0) *h = 0; } + else + { + *w = 0; + *h = 0; + } return 1; } --
