From 18433ec343dc9f684c201265d4c97ae730586a92 Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Mon, 8 Oct 2012 22:47:19 +0000 Subject: [PATCH] ephysics: fix sandbox material callback SVN revision: 77597 --- legacy/ephysics/data/themes/sandbox_misc.edc | 16 ++++++++-------- legacy/ephysics/src/bin/ephysics_sandbox.c | 20 +++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/legacy/ephysics/data/themes/sandbox_misc.edc b/legacy/ephysics/data/themes/sandbox_misc.edc index b4795dd087..8aa7ac2943 100644 --- a/legacy/ephysics/data/themes/sandbox_misc.edc +++ b/legacy/ephysics/data/themes/sandbox_misc.edc @@ -60,7 +60,7 @@ } group { - name: "0"; + name: "Custom"; parts { part { name: "ball"; @@ -73,9 +73,9 @@ } } } - + group { - name: "1"; + name: "Concrete"; parts { part { name: "ball"; @@ -90,7 +90,7 @@ } group { - name: "2"; + name: "Iron"; parts { part { name: "ball"; @@ -105,7 +105,7 @@ } group { - name: "3"; + name: "Plastic"; parts { part { name: "ball"; @@ -120,7 +120,7 @@ } group { - name: "4"; + name: "Polystyrene"; parts { part { name: "ball"; @@ -135,7 +135,7 @@ } group { - name: "5"; + name: "Rubber"; parts { part { name: "ball"; @@ -150,7 +150,7 @@ } group { - name: "6"; + name: "Wood"; parts { part { name: "ball"; diff --git a/legacy/ephysics/src/bin/ephysics_sandbox.c b/legacy/ephysics/src/bin/ephysics_sandbox.c index ae91eba2b5..9cebf74861 100644 --- a/legacy/ephysics/src/bin/ephysics_sandbox.c +++ b/legacy/ephysics/src/bin/ephysics_sandbox.c @@ -132,7 +132,9 @@ static void _body_material_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { EPhysics_Body *body = data; - //Evas_Object *body_image; + Evas_Object *body_image; + const char *material; + int x, y, w, h; ephysics_body_material_set(body, elm_spinner_value_get(obj)); @@ -142,19 +144,19 @@ _body_material_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) ephysics_body_friction_get(body)); elm_spinner_value_set(evas_object_data_get(obj, "restitution"), ephysics_body_restitution_get(body)); -/* - img_name = elm_spinner_value_get(obj); //name if its possible - evas_object_del(ephysics_body_evas_object_unset(body)); + body_image = ephysics_body_evas_object_unset(body); + evas_object_geometry_get(body_image, &x, &y, &w, &h); + evas_object_del(body_image); + material = elm_spinner_special_value_get(obj, elm_spinner_value_get(obj)); body_image = elm_image_add(evas_object_data_get(obj, "win")); elm_image_file_set( - body_image, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj", img_name); - evas_object_resize(body_image, 70, 70); - evas_object_move(body_image, 150, 150);//FIX! + body_image, PACKAGE_DATA_DIR "/" SANDBOX_THEME ".edj", material); + evas_object_resize(body_image, w, h); + evas_object_move(body_image, x, y); evas_object_show(body_image); - ephysics_body_evas_object_set(body, body_image, EINA_TRUE); -*/ + ephysics_body_evas_object_set(body, body_image, EINA_FALSE); } static void