diff options
author | David Walter Seikel | 2016-03-13 20:05:53 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-03-13 20:05:53 +1000 |
commit | 3729e986a4e1f93b0a5209d61ede1dfe59019664 (patch) | |
tree | bf487cbd960cb6bdb4c537c17abb2ca39cd31163 /src/extantz/extantz.c | |
parent | Update to new eo_* syntax. (diff) | |
download | SledjHamr-3729e986a4e1f93b0a5209d61ede1dfe59019664.zip SledjHamr-3729e986a4e1f93b0a5209d61ede1dfe59019664.tar.gz SledjHamr-3729e986a4e1f93b0a5209d61ede1dfe59019664.tar.bz2 SledjHamr-3729e986a4e1f93b0a5209d61ede1dfe59019664.tar.xz |
Different way of dealing with object popups, run a timer, check for mouse inactivity.
Diffstat (limited to 'src/extantz/extantz.c')
-rw-r--r-- | src/extantz/extantz.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index b5f272e..d20edb5 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -226,6 +226,7 @@ static void _on_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA | |||
226 | { | 226 | { |
227 | globals *ourGlobals = data; | 227 | globals *ourGlobals = data; |
228 | GLData *gld = &ourGlobals->gld; | 228 | GLData *gld = &ourGlobals->gld; |
229 | Scene_Data *scene = ourGlobals->scene; | ||
229 | Evas_Coord h; | 230 | Evas_Coord h; |
230 | 231 | ||
231 | efl_gfx_size_get(ourGlobals->win, &ourGlobals->win_w, &ourGlobals->win_h); | 232 | efl_gfx_size_get(ourGlobals->win, &ourGlobals->win_w, &ourGlobals->win_h); |
@@ -237,6 +238,13 @@ static void _on_resize(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA | |||
237 | efl_gfx_size_set(ourGlobals->win, ourGlobals->win_w, h); | 238 | efl_gfx_size_set(ourGlobals->win, ourGlobals->win_w, h); |
238 | // Stop internal windows going under the toolbar. | 239 | // Stop internal windows going under the toolbar. |
239 | evas_object_resize(ourGlobals->mainWindow->layout, ourGlobals->win_w, h); | 240 | evas_object_resize(ourGlobals->mainWindow->layout, ourGlobals->win_w, h); |
241 | |||
242 | if (scene) | ||
243 | { | ||
244 | evas_object_geometry_get(scene->image_e, &scene->x, &scene->y, &scene->w, &scene->h); | ||
245 | evas_canvas3d_scene_size_get(scene->scene, &scene->scene_w, &scene->scene_h); | ||
246 | } | ||
247 | |||
240 | #if USE_EPHYSICS | 248 | #if USE_EPHYSICS |
241 | if (ourGlobals->world) | 249 | if (ourGlobals->world) |
242 | ephysics_world_render_geometry_set(ourGlobals->world, 0, 0, -50, ourGlobals->win_w, ourGlobals->win_h, 100); | 250 | ephysics_world_render_geometry_set(ourGlobals->world, 0, 0, -50, ourGlobals->win_w, ourGlobals->win_h, 100); |