summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-07-20 11:34:01 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-07-20 11:34:01 +0900
commitba5e3ec2fbeb3638175bb400503193ff954e04be (patch)
tree813ac77760eea0c2e43d9ea7ac673c6ca2fd6ddd
parent1cdb999107063f7e16953b380c433e81e780aa8f (diff)
downloadefl-ba5e3ec2fbeb3638175bb400503193ff954e04be.tar.gz
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.
-rw-r--r--src/lib/evas/canvas/evas_object_image.c12
1 files 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 ad7810a279..c68c866fe5 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;
}