From bc2d36257f43716385fc795dcc2d0c4ac913165b Mon Sep 17 00:00:00 2001 From: Bruno Dilly Date: Fri, 10 Aug 2012 21:02:25 +0000 Subject: [PATCH] EPhysics: don't show background box on camera tests SVN revision: 75134 --- legacy/ephysics/data/themes/frame.edc | 36 ++++++++++++++++--- legacy/ephysics/src/bin/test_bouncing_ball.c | 1 + legacy/ephysics/src/bin/test_bouncing_text.c | 1 + .../ephysics/src/bin/test_colliding_balls.c | 1 + .../src/bin/test_collision_detection.c | 5 ++- .../ephysics/src/bin/test_collision_filter.c | 1 + .../ephysics/src/bin/test_collision_speed.c | 3 +- legacy/ephysics/src/bin/test_constraint.c | 1 + .../ephysics/src/bin/test_falling_letters.c | 1 + legacy/ephysics/src/bin/test_jumping_balls.c | 1 + legacy/ephysics/src/bin/test_no_gravity.c | 1 + legacy/ephysics/src/bin/test_rotate.c | 1 + .../src/bin/test_sleeping_threshold.c | 2 ++ legacy/ephysics/src/bin/test_slider.c | 1 + legacy/ephysics/src/bin/test_velocity.c | 1 + 15 files changed, 50 insertions(+), 7 deletions(-) diff --git a/legacy/ephysics/data/themes/frame.edc b/legacy/ephysics/data/themes/frame.edc index 5ebec3fe25..b36be47487 100644 --- a/legacy/ephysics/data/themes/frame.edc +++ b/legacy/ephysics/data/themes/frame.edc @@ -1,15 +1,27 @@ - images { - image: "arrows.png" COMP; - image: "background.jpg" COMP; - } - group { name: "frame"; + images { + image: "arrows.png" COMP; + image: "background.jpg" COMP; + } + parts { part { name: "bg"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + min: 512 384; + max: 512 384; + color: 153 134 117 255; + } + } + + part { + name: "borders"; type: IMAGE; mouse_events: 0; description { @@ -17,6 +29,12 @@ min: 512 384; max: 512 384; image.normal: "background.jpg"; + visible: 0; + } + description { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; } } @@ -166,6 +184,14 @@ target: "arrows_msg"; } + program { + name: "borders,show"; + source: "ephysics_test"; + signal: "borders,show"; + action: STATE_SET "visible" 0.0; + target: "borders"; + } + program { name: "velocity,show"; source: "ephysics_test"; diff --git a/legacy/ephysics/src/bin/test_bouncing_ball.c b/legacy/ephysics/src/bin/test_bouncing_ball.c index c5a205416e..b1ecdca7c8 100644 --- a/legacy/ephysics/src/bin/test_bouncing_ball.c +++ b/legacy/ephysics/src/bin/test_bouncing_ball.c @@ -84,6 +84,7 @@ test_bouncing_ball(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_object_signal_emit(test_data->layout, "arrows,show", "ephysics_test"); world = ephysics_world_new(); diff --git a/legacy/ephysics/src/bin/test_bouncing_text.c b/legacy/ephysics/src/bin/test_bouncing_text.c index 597d4b2347..ca8038d564 100644 --- a/legacy/ephysics/src/bin/test_bouncing_text.c +++ b/legacy/ephysics/src/bin/test_bouncing_text.c @@ -50,6 +50,7 @@ test_bouncing_text(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve test_data = test_data_new(); test_win_add(test_data, "Bouncing Text", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_colliding_balls.c b/legacy/ephysics/src/bin/test_colliding_balls.c index 9a7fdfe957..44b4723b74 100644 --- a/legacy/ephysics/src/bin/test_colliding_balls.c +++ b/legacy/ephysics/src/bin/test_colliding_balls.c @@ -69,6 +69,7 @@ test_colliding_balls(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e test_data = test_data_new(); test_win_add(test_data, "Colliding Balls", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_collision_detection.c b/legacy/ephysics/src/bin/test_collision_detection.c index 7755f159c4..87a251d46a 100644 --- a/legacy/ephysics/src/bin/test_collision_detection.c +++ b/legacy/ephysics/src/bin/test_collision_detection.c @@ -156,7 +156,10 @@ test_collision(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i return; } - test_win_add((Test_Data *)collision_data, "Collision Detection", EINA_FALSE); + test_win_add((Test_Data *)collision_data, "Collision Detection", + EINA_FALSE); + elm_object_signal_emit(collision_data->base.layout, "borders,show", + "ephysics_test"); evas_object_smart_callback_add(collision_data->base.win, "delete,request", _win_del, collision_data); elm_layout_signal_callback_add(collision_data->base.layout, "restart", diff --git a/legacy/ephysics/src/bin/test_collision_filter.c b/legacy/ephysics/src/bin/test_collision_filter.c index 2c485b8d3c..3be4b15c44 100644 --- a/legacy/ephysics/src/bin/test_collision_filter.c +++ b/legacy/ephysics/src/bin/test_collision_filter.c @@ -62,6 +62,7 @@ test_collision_filter(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void * test_data = test_data_new(); test_win_add(test_data, "Collision Filter", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_collision_speed.c b/legacy/ephysics/src/bin/test_collision_speed.c index 5429ad7e1e..30aba1f623 100644 --- a/legacy/ephysics/src/bin/test_collision_speed.c +++ b/legacy/ephysics/src/bin/test_collision_speed.c @@ -102,9 +102,10 @@ test_collision_speed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e test_win_add((Test_Data *) speed_data, "Collision with High Speed", EINA_FALSE); + elm_object_signal_emit(speed_data->base.layout, "borders,show", + "ephysics_test"); evas_object_smart_callback_add(speed_data->base.win, "delete,request", _win_del, speed_data); - elm_layout_signal_callback_add(speed_data->base.layout, "restart", "test-theme", _restart, speed_data); diff --git a/legacy/ephysics/src/bin/test_constraint.c b/legacy/ephysics/src/bin/test_constraint.c index 3a7d6c0c6e..946d4943ac 100644 --- a/legacy/ephysics/src/bin/test_constraint.c +++ b/legacy/ephysics/src/bin/test_constraint.c @@ -88,6 +88,7 @@ test_constraint(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ test_data = test_data_new(); test_win_add(test_data, "Constraint", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_falling_letters.c b/legacy/ephysics/src/bin/test_falling_letters.c index d1c7c1cc4d..749e415954 100644 --- a/legacy/ephysics/src/bin/test_falling_letters.c +++ b/legacy/ephysics/src/bin/test_falling_letters.c @@ -59,6 +59,7 @@ test_falling_letters(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e test_data = test_data_new(); test_win_add(test_data, "Falling Letters", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_jumping_balls.c b/legacy/ephysics/src/bin/test_jumping_balls.c index b8e58548b2..21e31c9d76 100644 --- a/legacy/ephysics/src/bin/test_jumping_balls.c +++ b/legacy/ephysics/src/bin/test_jumping_balls.c @@ -111,6 +111,7 @@ test_jumping_balls(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve test_data = test_data_new(); test_win_add(test_data, "Jumping Balls", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_no_gravity.c b/legacy/ephysics/src/bin/test_no_gravity.c index 81fa31971f..64b55665b9 100644 --- a/legacy/ephysics/src/bin/test_no_gravity.c +++ b/legacy/ephysics/src/bin/test_no_gravity.c @@ -98,6 +98,7 @@ test_no_gravity(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ test_data = test_data_new(); test_win_add(test_data, "No Gravity", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_rotate.c b/legacy/ephysics/src/bin/test_rotate.c index de740c9440..53f6436ab9 100644 --- a/legacy/ephysics/src/bin/test_rotate.c +++ b/legacy/ephysics/src/bin/test_rotate.c @@ -82,6 +82,7 @@ test_rotate(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info test_data = test_data_new(); test_win_add(test_data, "Rotate", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_sleeping_threshold.c b/legacy/ephysics/src/bin/test_sleeping_threshold.c index ca0424ac85..6fef00fd39 100644 --- a/legacy/ephysics/src/bin/test_sleeping_threshold.c +++ b/legacy/ephysics/src/bin/test_sleeping_threshold.c @@ -129,6 +129,8 @@ test_sleeping(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in } test_win_add((Test_Data *)sleeping_data, "Sleeping Threshold", EINA_FALSE); + elm_object_signal_emit(sleeping_data->base.layout, "borders,show", + "ephysics_test"); evas_object_smart_callback_add(sleeping_data->base.win, "delete,request", _win_del, sleeping_data); elm_layout_signal_callback_add(sleeping_data->base.layout, "restart", diff --git a/legacy/ephysics/src/bin/test_slider.c b/legacy/ephysics/src/bin/test_slider.c index e1a5cdee8b..927401f5be 100644 --- a/legacy/ephysics/src/bin/test_slider.c +++ b/legacy/ephysics/src/bin/test_slider.c @@ -152,6 +152,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info test_data = test_data_new(); test_win_add(test_data, "Slider", EINA_TRUE); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_layout_signal_callback_add(test_data->layout, "restart", "test-theme", _restart, test_data); diff --git a/legacy/ephysics/src/bin/test_velocity.c b/legacy/ephysics/src/bin/test_velocity.c index d62be6b717..920d770831 100644 --- a/legacy/ephysics/src/bin/test_velocity.c +++ b/legacy/ephysics/src/bin/test_velocity.c @@ -113,6 +113,7 @@ test_velocity(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in "Linear velocity: 0, 0"); elm_layout_text_set(test_data->layout, "angular_vel", "Angular velocity: 0"); + elm_object_signal_emit(test_data->layout, "borders,show", "ephysics_test"); elm_object_signal_emit(test_data->layout, "arrows,show", "ephysics_test"); elm_object_signal_emit(test_data->layout, "velocity,show", "ephysics_test");