From: Jin Yoon <jinny.yoon@samsung.com>
Date: Thu, 13 Dec 2012 06:31:06 +0000 (+0900)
Subject: Window size is not overflowed more than the root window size.
X-Git-Tag: submit/tizen_2.1/20130424.223356~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93a622ac8e6958b4c6df29da6f94b55cb95440cc;p=apps%2Fhome%2Fmenu-screen.git

Window size is not overflowed more than the root window size.

Change-Id: I7a677a35967c369eaf8cf5fcae68a9d9c2bd9925
---

diff --git a/include/conf.h b/include/conf.h
index 0df39be..bde663e 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -25,6 +25,7 @@
 #define BASE_WIDTH 720.0f
 
 #define PAGE_PORTRAIT_HEIGHT 1060.0f
+#define INDEX_HEIGHT 70
 
 #endif // _MENU_SCREEN_CONF_H_
 
diff --git a/src/all_apps/layout.c b/src/all_apps/layout.c
index 61d39db..7d394ea 100644
--- a/src/all_apps/layout.c
+++ b/src/all_apps/layout.c
@@ -121,8 +121,10 @@ Evas_Object *all_apps_layout_create(Evas_Object *controlbar, int rotate)
 	all_apps_edje = ALL_APPS_EDJE_PORTRAIT;
 	page_edje = GROUP_4X4_EDJE_PORTRAIT;
 	width = menu_screen_get_root_width();
-	height = menu_screen_get_root_height();
-	item_width = width / 4.0f;
+	height = menu_screen_get_root_height() - INDEX_HEIGHT;
+
+	if (menu_screen_get_root_width() > menu_screen_get_root_height()) item_width = height / 5.0f;
+	else item_width = width / 4.0f;
 
 	if (EINA_FALSE == elm_layout_file_set(all_apps, all_apps_edje, ALL_APPS_GROUP)) {
 		evas_object_del(all_apps);
diff --git a/src/layout.c b/src/layout.c
index b56b477..f28751b 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -45,7 +45,7 @@ Evas_Object *layout_create(Evas_Object *conformant, const char *file, const char
 		retv_if(NULL == layout, NULL);
 
 		width = menu_screen_get_root_width();
-		height = menu_screen_get_root_height();
+		height = menu_screen_get_root_height() - INDEX_HEIGHT;
 
 		evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 		evas_object_size_hint_min_set(layout, width, height);
diff --git a/src/menu_screen.c b/src/menu_screen.c
index d2dc8d3..acd6650 100644
--- a/src/menu_screen.c
+++ b/src/menu_screen.c
@@ -143,7 +143,6 @@ static menu_screen_error_e _create_canvas(char *name, char *title)
 		_E("[%s] Failed to get ecore_evas object", __func__);
 	}
 
-	evas_object_move(menu_screen_info.win, 0, 0);
 	evas_object_size_hint_min_set(menu_screen_info.win, menu_screen_info.root_width, menu_screen_info.root_height);
 	evas_object_size_hint_max_set(menu_screen_info.win, menu_screen_info.root_width, menu_screen_info.root_height);
 	evas_object_resize(menu_screen_info.win, menu_screen_info.root_width, menu_screen_info.root_height);