aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2018-06-25 11:28:56 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-25 11:28:57 -0400
commit561d22929c4dd8385f49be9d71a8b114efcccc29 (patch)
treeaa355a761ff0178ded540f43ebbd3a7be2625651
parenttests: add some more failure cases for efl_parent_set in eo tests (diff)
downloadefl-561d22929c4dd8385f49be9d71a8b114efcccc29.tar.gz
elementary_bin: Wrap calls to edje_object_part_object_get with edje_freeze/thaw
Summary: @ref https://phab.enlightenment.org/T6884 Reviewers: zmike, ManMower Reviewed By: zmike Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T6884 Differential Revision: https://phab.enlightenment.org/D6402
-rw-r--r--src/bin/elementary/test_access.c10
-rw-r--r--src/bin/elementary/test_focus.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/src/bin/elementary/test_access.c b/src/bin/elementary/test_access.c
index 80b8ea36e6..c3154f695e 100644
--- a/src/bin/elementary/test_access.c
+++ b/src/bin/elementary/test_access.c
@@ -286,7 +286,9 @@ test_access2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
evas_object_show(ly2);
/* access */
+ edje_object_freeze(elm_layout_edje_get(ly2));
to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly2), "access");
+ edje_object_thaw(elm_layout_edje_get(ly2));
ao = elm_access_object_register(to, ly2);
elm_object_focus_custom_chain_append(ly2, ao, NULL);
}
@@ -371,22 +373,30 @@ test_access3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
elm_object_part_content_set(ly, "center", btn);
+ edje_object_freeze(elm_layout_edje_get(ly));
to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "red");
+ edje_object_thaw(elm_layout_edje_get(ly));
red_ao = elm_access_object_register(to, ly);
elm_access_info_cb_set(red_ao, ELM_ACCESS_INFO, _access_info_cb, "red");
elm_access_highlight_next_set(btn, ELM_HIGHLIGHT_DIR_NEXT, red_ao);
+ edje_object_freeze(elm_layout_edje_get(ly));
to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "green");
+ edje_object_thaw(elm_layout_edje_get(ly));
green_ao = elm_access_object_register(to, ly);
elm_access_info_cb_set(green_ao, ELM_ACCESS_INFO, _access_info_cb, "green");
elm_access_highlight_next_set(red_ao, ELM_HIGHLIGHT_DIR_NEXT, green_ao);
+ edje_object_freeze(elm_layout_edje_get(ly));
to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "blue");
+ edje_object_thaw(elm_layout_edje_get(ly));
blue_ao = elm_access_object_register(to, ly);
elm_access_info_cb_set(blue_ao, ELM_ACCESS_INFO, _access_info_cb, "blue");
elm_access_highlight_next_set(green_ao, ELM_HIGHLIGHT_DIR_NEXT, blue_ao);
+ edje_object_freeze(elm_layout_edje_get(ly));
to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "black");
+ edje_object_thaw(elm_layout_edje_get(ly));
black_ao = elm_access_object_register(to, ly);
elm_access_info_cb_set(black_ao, ELM_ACCESS_INFO, _access_info_cb, "black");
elm_access_highlight_next_set(blue_ao, ELM_HIGHLIGHT_DIR_NEXT, black_ao);
diff --git a/src/bin/elementary/test_focus.c b/src/bin/elementary/test_focus.c
index 9af57a77b6..ceb6e5cdd5 100644
--- a/src/bin/elementary/test_focus.c
+++ b/src/bin/elementary/test_focus.c
@@ -563,7 +563,9 @@ _focus_layout_part(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA
{
Evas_Object *ed = elm_layout_edje_get(data);
+ edje_object_freeze(ed);
Evas_Object *newfocus = (Evas_Object *)edje_object_part_object_get(ed, "sky");
+ edje_object_thaw(ed);
const char *type = evas_object_type_get(newfocus);
printf("evas_object_focus_set(%p, EINA_TRUE) %s\n", newfocus, type);
evas_object_focus_set(newfocus, EINA_TRUE);;