aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-03-13 20:06:16 +1000
committerDavid Walter Seikel2016-03-13 20:06:16 +1000
commitcc1b58c2650322824a8cbb56c99fd8af125af909 (patch)
tree6e105444d78820e5108458fce5d8bfc9f3e612c5
parentDifferent way of dealing with object popups, run a timer, check for mouse ina... (diff)
downloadSledjHamr-cc1b58c2650322824a8cbb56c99fd8af125af909.zip
SledjHamr-cc1b58c2650322824a8cbb56c99fd8af125af909.tar.gz
SledjHamr-cc1b58c2650322824a8cbb56c99fd8af125af909.tar.bz2
SledjHamr-cc1b58c2650322824a8cbb56c99fd8af125af909.tar.xz
Resizing cleanup.
-rw-r--r--src/extantz/extantz.c18
1 files changed, 8 insertions, 10 deletions
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)
168} 168}
169 169
170 170
171static void _resize_winwin(GLData *gld) 171// Called from on_pixels (), or the resize callbacks.
172static void _resize(GLData *gld)
172{ 173{
174 Evas_GL_API *gl = gld->glApi;
175
176 if (gld->elmGl)
177 {
173 Evas_Coord x, y, w, h; 178 Evas_Coord x, y, w, h;
174 179
175 evas_object_geometry_get(gld->elmGl, &x, &y, &w, &h); 180 evas_object_geometry_get(gld->elmGl, &x, &y, &w, &h);
176 evas_object_move(elm_win_inlined_image_object_get (gld->winwin), x, y); 181 evas_object_move(elm_win_inlined_image_object_get (gld->winwin), x, y);
177 evas_object_resize(elm_win_inlined_image_object_get(gld->winwin), w, h); 182 evas_object_resize(elm_win_inlined_image_object_get(gld->winwin), w, h);
178} 183 }
179
180// Called from on_pixels (), or the Elm_gliew resize callback.
181static void _resize(GLData *gld)
182{
183 Evas_GL_API *gl = gld->glApi;
184
185 if (gld->elmGl)
186 _resize_winwin(gld);
187 184
188#if DO_GEARS 185#if DO_GEARS
189 GLfloat ar, m[16] = { 186 GLfloat ar, m[16] = {
@@ -209,6 +206,7 @@ static void _resize(GLData *gld)
209 gl->glViewport(0, 0, (GLint) gld->img_w, (GLint) gld->img_h); 206 gl->glViewport(0, 0, (GLint) gld->img_w, (GLint) gld->img_h);
210} 207}
211 208
209// Only used if (USE_IRR || DO_GEARS)
212static void _resize_gl(Evas_Object *obj) 210static void _resize_gl(Evas_Object *obj)
213{ 211{
214 globals *ourGlobals = evas_object_data_get(obj, "glob"); 212 globals *ourGlobals = evas_object_data_get(obj, "glob");