From 3672abba40dabf6e86c0cb6f9b42aead16d758a2 Mon Sep 17 00:00:00 2001 From: junkyu han Date: Thu, 7 Jul 2016 17:33:39 +0900 Subject: [PATCH] Add evas object show for all apps layout & fix transparent layout Change-Id: Id1b23fb5faf812b702cde0a57915f755771a752b --- data/edje/all_apps_portrait.edc | 2 +- data/edje/layout_portrait.edc | 2 +- src/all_apps/layout.c | 2 ++ src/layout.c | 1 + src/menu_screen.c | 5 ++++- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/data/edje/all_apps_portrait.edc b/data/edje/all_apps_portrait.edc index 8ab707d..87cd8e1 100644 --- a/data/edje/all_apps_portrait.edc +++ b/data/edje/all_apps_portrait.edc @@ -38,7 +38,7 @@ collections { state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } - visible: 0; + visible: 1; } } part { diff --git a/data/edje/layout_portrait.edc b/data/edje/layout_portrait.edc index 6bcea05..a6c31ec 100644 --- a/data/edje/layout_portrait.edc +++ b/data/edje/layout_portrait.edc @@ -60,7 +60,7 @@ collections { state: "default" 0.0; rel1 { relative: 0.0 0.0; } rel2 { relative: 1.0 1.0; } - visible: 0; + visible: 1; } } part { diff --git a/src/all_apps/layout.c b/src/all_apps/layout.c index 990df28..abec7ac 100644 --- a/src/all_apps/layout.c +++ b/src/all_apps/layout.c @@ -338,6 +338,7 @@ HAPI Evas_Object *all_apps_layout_create(Evas_Object *controlbar, int rotate) evas_object_size_hint_max_set(bg, width, height); evas_object_resize(bg, width, height); elm_object_part_content_set(all_apps, "bg", bg); + evas_object_color_set(bg, 0, 0, 0, 0); evas_object_show(bg); evas_object_data_set(all_apps, "win", evas_object_data_get(controlbar, "win")); @@ -357,6 +358,7 @@ HAPI Evas_Object *all_apps_layout_create(Evas_Object *controlbar, int rotate) evas_object_size_hint_min_set(all_apps, width, height); evas_object_size_hint_max_set(all_apps, width, height); evas_object_resize(all_apps, width, height); + evas_object_show(all_apps); index = index_create(all_apps, 0, 0); if (NULL == index) { diff --git a/src/layout.c b/src/layout.c index b04d94e..75f7871 100644 --- a/src/layout.c +++ b/src/layout.c @@ -62,6 +62,7 @@ HAPI Evas_Object *layout_create(Evas_Object *conformant, const char *file, const evas_object_size_hint_max_set(bg, width, height); evas_object_resize(bg, width, height); elm_object_part_content_set(layout, "bg", bg); + evas_object_color_set(bg, 0, 0, 0, 0); evas_object_show(bg); evas_object_data_set(layout, "win", menu_screen_get_win()); diff --git a/src/menu_screen.c b/src/menu_screen.c index 0c0e4f7..42b36fc 100755 --- a/src/menu_screen.c +++ b/src/menu_screen.c @@ -307,7 +307,10 @@ static void _create_bg(void) Evas_Object *rect; rect = evas_object_rectangle_add(menu_screen_get_evas()); - ret_if(!rect); + if (NULL == rect) { + free(buf); + return; + } evas_object_data_set(menu_screen_get_win(), "rect", rect); evas_object_color_set(rect, 0, 0, 0, 255); evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -- 2.34.1