aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/GuiLua
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-04-28 00:30:06 +1000
committerDavid Walter Seikel2014-04-28 00:30:06 +1000
commit5ac7c0e417999c45e4beb189c701a7d3242fdc13 (patch)
treed629ef14386989cec1e79d2f84b76345221e744e /src/GuiLua
parentDon't do md2 mesh if we want the cube. (diff)
downloadSledjHamr-5ac7c0e417999c45e4beb189c701a7d3242fdc13.zip
SledjHamr-5ac7c0e417999c45e4beb189c701a7d3242fdc13.tar.gz
SledjHamr-5ac7c0e417999c45e4beb189c701a7d3242fdc13.tar.bz2
SledjHamr-5ac7c0e417999c45e4beb189c701a7d3242fdc13.tar.xz
Some code shuffling.
Diffstat (limited to 'src/GuiLua')
-rw-r--r--src/GuiLua/GuiLua.c33
1 files changed, 16 insertions, 17 deletions
diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index b889681..b34d8cc 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -442,19 +442,6 @@ _scene_setup(globals *ourGlobals, Scene_Data *scene)
442 ); 442 );
443} 443}
444 444
445
446
447// TODO - These functions should be able to deal with multiple windows.
448// TODO - Should be able to open external and internal windows, and even switch between them on the fly.
449static void _on_done(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
450{
451// globals *ourGlobals = data;
452
453 // Tell the main loop to stop, which it will, eventually.
454 elm_exit();
455}
456
457
458/* Sooo, how to do this - 445/* Sooo, how to do this -
459widget has to be a light userdata 446widget has to be a light userdata
460The rest can be Lua sub things? Each with a C function to update the widget. 447The rest can be Lua sub things? Each with a C function to update the widget.
@@ -475,6 +462,9 @@ struct _Widget
475 // skangCoord x, y, w, h 462 // skangCoord x, y, w, h
476}; 463};
477 464
465
466// TODO - These functions should be able to deal with multiple windows.
467// TODO - Should be able to open external and internal windows, and even switch between them on the fly.
478static void _on_click(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) 468static void _on_click(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
479{ 469{
480 globals *ourGlobals; 470 globals *ourGlobals;
@@ -494,6 +484,14 @@ static void _on_click(void *data, Evas_Object *obj, void *event_info EINA_UNUSED
494 } 484 }
495} 485}
496 486
487static void _on_done(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
488{
489// globals *ourGlobals = data;
490
491 // Tell the main loop to stop, which it will, eventually.
492 elm_exit();
493}
494
497static int widget(lua_State *L) 495static int widget(lua_State *L)
498{ 496{
499 globals *ourGlobals; 497 globals *ourGlobals;
@@ -611,11 +609,12 @@ static int window(lua_State *L)
611 wid->obj = eo_add(EVAS_OBJ_IMAGE_CLASS, ourGlobals->win); 609 wid->obj = eo_add(EVAS_OBJ_IMAGE_CLASS, ourGlobals->win);
612 eo_do(wid->obj, 610 eo_do(wid->obj,
613 evas_obj_image_filled_set(EINA_TRUE), 611 evas_obj_image_filled_set(EINA_TRUE),
614 evas_obj_image_size_set(w, h), 612// evas_obj_image_size_set(w, h),
615// evas_obj_size_set(w, h), 613 evas_obj_image_file_set("../../media/sky_01.jpg", NULL),
616 evas_obj_position_set(0, 0), 614 evas_obj_position_set(0, 0),
617 evas_obj_visibility_set(EINA_TRUE), 615 evas_obj_size_set(w, h),
618 evas_obj_image_scene_set(data.scene) 616 evas_obj_visibility_set(EINA_TRUE)
617// evas_obj_image_scene_set(ourScene.scene)
619 ); 618 );
620// evas_object_resize(wid->obj, w, h); 619// evas_object_resize(wid->obj, w, h);
621// evas_object_move(wid->obj, 0, 0); 620// evas_object_move(wid->obj, 0, 0);