From cc1b58c2650322824a8cbb56c99fd8af125af909 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Mar 2016 20:06:16 +1000 Subject: Resizing cleanup. --- src/extantz/extantz.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/extantz/extantz.c') diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index d20edb5..159fcaf 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c @@ -168,22 +168,19 @@ static void gldata_init(GLData *gld) } -static void _resize_winwin(GLData *gld) +// Called from on_pixels (), or the resize callbacks. +static void _resize(GLData *gld) { + Evas_GL_API *gl = gld->glApi; + + if (gld->elmGl) + { Evas_Coord x, y, w, h; evas_object_geometry_get(gld->elmGl, &x, &y, &w, &h); evas_object_move(elm_win_inlined_image_object_get (gld->winwin), x, y); evas_object_resize(elm_win_inlined_image_object_get(gld->winwin), w, h); -} - -// Called from on_pixels (), or the Elm_gliew resize callback. -static void _resize(GLData *gld) -{ - Evas_GL_API *gl = gld->glApi; - - if (gld->elmGl) - _resize_winwin(gld); + } #if DO_GEARS GLfloat ar, m[16] = { @@ -209,6 +206,7 @@ static void _resize(GLData *gld) gl->glViewport(0, 0, (GLint) gld->img_w, (GLint) gld->img_h); } +// Only used if (USE_IRR || DO_GEARS) static void _resize_gl(Evas_Object *obj) { globals *ourGlobals = evas_object_data_get(obj, "glob"); -- cgit v1.1