summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Michael <cp.michael@samsung.com>2019-05-29 09:25:17 -0400
committerChristopher Michael <cp.michael@samsung.com>2019-05-29 09:48:51 -0400
commitfc7566a74cc22e766dd09ecfb8017778641da91f (patch)
tree67576b4e96eb5ec842d8a2e27db86963fa699687
parent274327c7b7b6bb1632ff8f58062f23bcc05c4a0f (diff)
downloadefl-fc7566a74cc22e766dd09ecfb8017778641da91f.tar.gz
evas_inline: Clean up evas_inline.x
This file is full of functions called as: foo(eo_obj, obj); Most of them can be reduced to foo(obj); and internally get the eo_obj with obj->object This would make it impossible to screw up calling them passing an unrelated pair, and make calling code a little more readable. ref T7230
-rw-r--r--src/lib/evas/canvas/evas_render.c4
-rw-r--r--src/lib/evas/include/evas_inline.x4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index ce3ed0f737..59d90bebb4 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1879,10 +1879,10 @@ evas_render_mapped(Evas_Public_Data *evas, Evas_Object *eo_obj,
}
}
}
- else if (!evas_object_is_proxy_visible(eo_obj, obj) ||
+ else if (!evas_object_is_proxy_visible(obj) ||
(obj->clip.clipees) || (obj->cur->have_clipees))
{
- IFRD(!evas_object_is_proxy_visible(eo_obj, obj), level, " proxy not visible\n");
+ IFRD(!evas_object_is_proxy_visible(obj), level, " proxy not visible\n");
IFRD(obj->clip.clipees || obj->cur->have_clipees, level, " has clippees\n");
RD(level, "}\n");
eina_evlog("-render_object", eo_obj, 0.0, NULL);
diff --git a/src/lib/evas/include/evas_inline.x b/src/lib/evas/include/evas_inline.x
index ad6fca2dbb..b9989ee461 100644
--- a/src/lib/evas/include/evas_inline.x
+++ b/src/lib/evas/include/evas_inline.x
@@ -209,7 +209,7 @@ evas_object_clippers_is_visible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro
}
static inline int
-evas_object_is_proxy_visible(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
+evas_object_is_proxy_visible(Evas_Object_Protected_Data *obj)
{
if ((obj->cur->visible) &&
//FIXME: Check the cached clipper visible properly.
@@ -218,7 +218,7 @@ evas_object_is_proxy_visible(Evas_Object *eo_obj, Evas_Object_Protected_Data *ob
|| obj->cur->render_op != EVAS_RENDER_BLEND))
{
if (obj->func->is_visible)
- return obj->func->is_visible(eo_obj);
+ return obj->func->is_visible(obj->object);
return 1;
}
return 0;