summaryrefslogtreecommitdiff
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
parentd2a703e7b812398700894b9d3de4da5e3dc86c61 (diff)
elementary_bin: Wrap calls to edje_object_part_object_get with edje_freeze/thaw
Summary: @ref T6884 Reviewers: zmike, ManMower Reviewed By: zmike Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: 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
286 evas_object_show(ly2); 286 evas_object_show(ly2);
287 287
288 /* access */ 288 /* access */
289 edje_object_freeze(elm_layout_edje_get(ly2));
289 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly2), "access"); 290 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly2), "access");
291 edje_object_thaw(elm_layout_edje_get(ly2));
290 ao = elm_access_object_register(to, ly2); 292 ao = elm_access_object_register(to, ly2);
291 elm_object_focus_custom_chain_append(ly2, ao, NULL); 293 elm_object_focus_custom_chain_append(ly2, ao, NULL);
292 } 294 }
@@ -371,22 +373,30 @@ test_access3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
371 373
372 elm_object_part_content_set(ly, "center", btn); 374 elm_object_part_content_set(ly, "center", btn);
373 375
376 edje_object_freeze(elm_layout_edje_get(ly));
374 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "red"); 377 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "red");
378 edje_object_thaw(elm_layout_edje_get(ly));
375 red_ao = elm_access_object_register(to, ly); 379 red_ao = elm_access_object_register(to, ly);
376 elm_access_info_cb_set(red_ao, ELM_ACCESS_INFO, _access_info_cb, "red"); 380 elm_access_info_cb_set(red_ao, ELM_ACCESS_INFO, _access_info_cb, "red");
377 elm_access_highlight_next_set(btn, ELM_HIGHLIGHT_DIR_NEXT, red_ao); 381 elm_access_highlight_next_set(btn, ELM_HIGHLIGHT_DIR_NEXT, red_ao);
378 382
383 edje_object_freeze(elm_layout_edje_get(ly));
379 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "green"); 384 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "green");
385 edje_object_thaw(elm_layout_edje_get(ly));
380 green_ao = elm_access_object_register(to, ly); 386 green_ao = elm_access_object_register(to, ly);
381 elm_access_info_cb_set(green_ao, ELM_ACCESS_INFO, _access_info_cb, "green"); 387 elm_access_info_cb_set(green_ao, ELM_ACCESS_INFO, _access_info_cb, "green");
382 elm_access_highlight_next_set(red_ao, ELM_HIGHLIGHT_DIR_NEXT, green_ao); 388 elm_access_highlight_next_set(red_ao, ELM_HIGHLIGHT_DIR_NEXT, green_ao);
383 389
390 edje_object_freeze(elm_layout_edje_get(ly));
384 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "blue"); 391 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "blue");
392 edje_object_thaw(elm_layout_edje_get(ly));
385 blue_ao = elm_access_object_register(to, ly); 393 blue_ao = elm_access_object_register(to, ly);
386 elm_access_info_cb_set(blue_ao, ELM_ACCESS_INFO, _access_info_cb, "blue"); 394 elm_access_info_cb_set(blue_ao, ELM_ACCESS_INFO, _access_info_cb, "blue");
387 elm_access_highlight_next_set(green_ao, ELM_HIGHLIGHT_DIR_NEXT, blue_ao); 395 elm_access_highlight_next_set(green_ao, ELM_HIGHLIGHT_DIR_NEXT, blue_ao);
388 396
397 edje_object_freeze(elm_layout_edje_get(ly));
389 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "black"); 398 to = (Evas_Object *)edje_object_part_object_get(elm_layout_edje_get(ly), "black");
399 edje_object_thaw(elm_layout_edje_get(ly));
390 black_ao = elm_access_object_register(to, ly); 400 black_ao = elm_access_object_register(to, ly);
391 elm_access_info_cb_set(black_ao, ELM_ACCESS_INFO, _access_info_cb, "black"); 401 elm_access_info_cb_set(black_ao, ELM_ACCESS_INFO, _access_info_cb, "black");
392 elm_access_highlight_next_set(blue_ao, ELM_HIGHLIGHT_DIR_NEXT, black_ao); 402 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
563{ 563{
564 Evas_Object *ed = elm_layout_edje_get(data); 564 Evas_Object *ed = elm_layout_edje_get(data);
565 565
566 edje_object_freeze(ed);
566 Evas_Object *newfocus = (Evas_Object *)edje_object_part_object_get(ed, "sky"); 567 Evas_Object *newfocus = (Evas_Object *)edje_object_part_object_get(ed, "sky");
568 edje_object_thaw(ed);
567 const char *type = evas_object_type_get(newfocus); 569 const char *type = evas_object_type_get(newfocus);
568 printf("evas_object_focus_set(%p, EINA_TRUE) %s\n", newfocus, type); 570 printf("evas_object_focus_set(%p, EINA_TRUE) %s\n", newfocus, type);
569 evas_object_focus_set(newfocus, EINA_TRUE);; 571 evas_object_focus_set(newfocus, EINA_TRUE);;