[TSAM-6889] add widget padding

Change-Id: If554629bafa9417d1b87e744b555204003ad706a
Signed-off-by: YoungHun Cho <hoon.cho@samsung.com>

diff --git a/.rds_delta b/.rds_delta
index a8acc85..3ec656b 100644 (file)
--- a/.rds_delta
+++ b/.rds_delta
@@ -4,3 +4,17 @@
 author-signature.xml
 signature1.xml
 bin/homescreen-efl
+res/edje/add_widget_viewer.edj
+res/edje/app_icon.edj
+res/edje/apps_chooser_btn.edj
+res/edje/apps_folder_icon.edj
+res/edje/apps_folder_popup.edj
+res/edje/apps_view.edj
+res/edje/apps_view_bg.edj
+res/edje/cluster_allpage.edj
+res/edje/cluster_allpage_thumbnail.edj
+res/edje/cluster_page.edj
+res/edje/home.edj
+res/edje/home_btn.edj
+res/edje/page_indicator_unit.edj
+res/edje/widget.edj

diff --git a/Build/build_edc.mk b/Build/build_edc.mk
index 8485bb2..38e5598 100644 (file)
--- a/Build/build_edc.mk
+++ b/Build/build_edc.mk
@@ -58,9 +58,9 @@ ifneq ($$(strip $$(_ALL_SRCS)),)
 
 _ENC_SRCS := $$(call ENCODE_4MAKE,$$(_ALL_SRCS)) 
 
-_COMPILER_FLAGS := -id "$$(_OUTPUT_DIR)" -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images"
-_COMPILER_FLAGS += -sd "$$(_OUTPUT_DIR)" -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds"
-_COMPILER_FLAGS += -fd "$$(_OUTPUT_DIR)" -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts"
+_COMPILER_FLAGS := -id "$$(SDK_TOOLPATH)/enventor/share/enventor/images"
+_COMPILER_FLAGS += -sd "$$(SDK_TOOLPATH)/enventor/share/enventor/sounds"
+_COMPILER_FLAGS += -fd "$$(SDK_TOOLPATH)/enventor/share/enventor/fonts"
 
 ifneq ($$(strip $$(_IMAGE_DIRS)),)
 _COMPILER_FLAGS += $$(addprefix -id ,$$(_IMAGE_DIRS))

diff --git a/inc/conf.h b/inc/conf.h
index 04c2639..6718cc1 100755 (executable)
--- a/inc/conf.h
+++ b/inc/conf.h
@@ -66,7 +66,7 @@ extern int __conf_get_window_w();
 
 #define CLUSTER_VIEW_W ((720) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_VIEW_H ((1150) * (__conf_get_resolution_scale_h()))
-#define CLUSTER_W CLUSTER_VIEW_W
+#define CLUSTER_W ((708) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_H CLUSTER_W
 #define CLUSTER_ALL_PAGE_W ((320) * (__conf_get_resolution_scale_w()))
 #define CLUSTER_ALL_PAGE_H CLUSTER_ALL_PAGE_W

diff --git a/project_def.prop b/project_def.prop
index cfbf120..6989a8d 100755 (executable)
--- a/project_def.prop
+++ b/project_def.prop
@@ -8,56 +8,67 @@ type = app
 # Project Profile
 profile = mobile-3.0
 
-# C/CPP Sources
-USER_SRCS = src/apps_data.c src/apps_view.c src/menu.c src/homescreen-efl.c src/hw_key.c src/popup.c src/cluster_page.c src/cluster_db.c src/cluster_view.c src/add_widget_viewer/add_widget_viewer.c src/widget_viewer.c src/apps_db.c src/page_indicator.c src/cluster_data.c src/apps_package_manager.c src/util.c src/add_widget_viewer/add_widget_data.c src/conf.c
+# C Sources
+USER_SRCS = src/apps_data.c src/homescreen-efl.c src/popup.c src/cluster_page.c src/cluster_db.c src/cluster_view.c src/widget_viewer.c src/page_indicator.c src/cluster_data.c src/conf.c src/add_widget_viewer/add_widget_data.c src/apps_view.c src/menu.c src/hw_key.c src/add_widget_viewer/add_widget_viewer.c src/apps_db.c src/apps_package_manager.c src/util.c 
+USER_SRCS_ABS = 
 
 # EDC Sources
-USER_EDCS =
+USER_EDCS =  
 
 # PO Sources
-USER_POS = res/po/ca.po res/po/fr.po res/po/nl.po res/po/pt_BR.po res/po/sk.po res/po/sv.po res/po/uz.po res/po/ko_KR.po res/po/is.po res/po/ka.po res/po/ro.po res/po/it_IT.po res/po/en_PH.po res/po/lt.po res/po/mk.po res/po/nb.po res/po/ru_RU.po res/po/el_GR.po res/po/zh_TW.po res/po/az.po res/po/hr.po res/po/uk.po res/po/zh_CN.po res/po/de.po res/po/es_US.po res/po/eu.po res/po/kk.po res/po/sl.po res/po/et.po res/po/fr_CA.po res/po/ga.po res/po/gl.po res/po/hy.po res/po/lv.po res/po/ja_JP.po res/po/es_ES.po res/po/bg.po res/po/cs.po res/po/pl.po res/po/pt_PT.po res/po/sr.po res/po/hu.po res/po/ar.po res/po/en_US.po res/po/fi.po res/po/da.po res/po/en.po res/po/zh_HK.po res/po/tr_TR.po
+USER_POS = res/po/pt_BR.po res/po/ro.po res/po/ko_KR.po res/po/ka.po res/po/is.po res/po/ru_RU.po res/po/en_PH.po res/po/it_IT.po res/po/el_GR.po res/po/uk.po res/po/hr.po res/po/az.po res/po/zh_CN.po res/po/es_US.po res/po/kk.po res/po/eu.po res/po/et.po res/po/lv.po res/po/hy.po res/po/ga.po res/po/ja_JP.po res/po/bg.po res/po/es_ES.po res/po/pt_PT.po res/po/pl.po res/po/hu.po res/po/en_US.po res/po/da.po res/po/tr_TR.po res/po/uz.po res/po/sv.po res/po/sk.po res/po/nl.po res/po/fr.po res/po/ca.po res/po/nb.po res/po/mk.po res/po/lt.po res/po/zh_TW.po res/po/de.po res/po/sl.po res/po/fr_CA.po res/po/gl.po res/po/sr.po res/po/cs.po res/po/ar.po res/po/fi.po res/po/en.po res/po/zh_HK.po 
 
 # User Defines
-USER_DEFS =
-USER_CPP_DEFS =
+USER_DEFS = 
+USER_CPP_DEFS = 
 
 # User Undefines
-USER_UNDEFS =
-USER_CPP_UNDEFS =
+USER_UNDEFS = 
+USER_CPP_UNDEFS = 
 
 # User Libraries
-USER_LIBS =
+USER_LIBS = 
 
 # User Objects
-USER_OBJS =
+USER_OBJS = 
+USER_OBJS_ABS = 
 
 # User Includes
 ## C Compiler
-USER_C_INC_DIRS = inc
-USER_INC_FILES =
+USER_INC_DIRS = inc 
+USER_INC_DIRS_ABS = 
+USER_INC_FILES = 
+USER_INC_FILES_ABS = 
 ## C++ Compiler
-USER_CPP_INC_DIRS =
-USER_CPP_INC_FILES =
-
-USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS)
+USER_CPP_INC_DIRS = 
+USER_CPP_INC_DIRS_ABS = 
+USER_CPP_INC_FILES = 
+USER_CPP_INC_FILES_ABS = 
 
 # User Library Path
-USER_LIB_DIRS =
+USER_LIB_DIRS = 
+USER_LIB_DIRS_ABS = 
 
 # EDC Resource Path
-USER_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images res/images
-USER_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds
-USER_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
+USER_EDCS_IMAGE_DIRS = edje/images res/images 
+USER_EDCS_IMAGE_DIRS_ABS = 
+USER_EDCS_SOUND_DIRS = edje/sounds 
+USER_EDCS_SOUND_DIRS_ABS = 
+USER_EDCS_FONT_DIRS = edje/fonts 
+USER_EDCS_FONT_DIRS_ABS = 
 
 # EDC Flags
-USER_EXT_EDC_KEYS = EDC0
+USER_EXT_EDC_KEYS = EDC0 
 
-USER_EXT_EDC0_EDCS = res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/widget.edc res/edje/add_widget_viewer.edc res/edje/apps_folder_icon.edc res/edje/apps_chooser_btn.edc res/edje/apps_folder_popup.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage.edc
-USER_EXT_EDC0_EDCS_IMAGE_DIRS = ${OUTPUT_DIR} edje/images res/images
-USER_EXT_EDC0_EDCS_SOUND_DIRS = ${OUTPUT_DIR} edje/sounds
-USER_EXT_EDC0_EDCS_FONT_DIRS = ${OUTPUT_DIR} edje/fonts
+USER_EXT_EDC0_EDCS = res/edje/widget.edc res/edje/apps_folder_icon.edc res/edje/apps_folder_popup.edc res/edje/apps_view.edc res/edje/page_indicator_unit.edc res/edje/apps_view_bg.edc res/edje/cluster_allpage_thumbnail.edc res/edje/home_btn.edc res/edje/home.edc res/edje/apps_chooser_btn.edc res/edje/add_widget_viewer.edc res/edje/app_icon.edc res/edje/cluster_page.edc res/edje/cluster_allpage.edc 
+USER_EXT_EDC0_EDCS_IMAGE_DIRS = edje/images res/images 
+USER_EXT_EDC0_EDCS_IMAGE_DIRS_ABS = 
+USER_EXT_EDC0_EDCS_SOUND_DIRS = edje/sounds 
+USER_EXT_EDC0_EDCS_SOUND_DIRS_ABS = 
+USER_EXT_EDC0_EDCS_FONT_DIRS = edje/fonts 
+USER_EXT_EDC0_EDCS_FONT_DIRS_ABS = 
 
 # Resource Filter
-USER_RES_INCLUDE =
-USER_RES_EXCLUDE =
+USER_RES_INCLUDE = 
+USER_RES_EXCLUDE = 
 

diff --git a/res/edje/cluster_page.edc b/res/edje/cluster_page.edc
index 34e4eec..1e531b0 100755 (executable)
--- a/res/edje/cluster_page.edc
+++ b/res/edje/cluster_page.edc
@@ -39,16 +39,16 @@ collections {
                                        align: 0 0;
                                        visible: 0;
                                        color : 0 0 0 0;
-                                       rel1{relative: 0.0 0.0; to: SIZE_SETTER;}
-                                       rel2{relative: 1.0 1.0; to: SIZE_SETTER;}
+                                       rel1{relative: 0.01 0.06; to: SIZE_SETTER;}
+                                       rel2{relative: 0.99 0.675; to: SIZE_SETTER;}
                                }
                                description {
                                        state: "edit" 0.0;
                                        inherit: "default" 0.0;
                                        color : 0 0 0 50;
                                        visible: 1;
-                                       rel1{relative: 0.05 0.05; to: SIZE_SETTER;}
-                                       rel2{relative: 0.95 0.95; to: SIZE_SETTER;}
+                                       rel1{relative: 0.057 0.066; to: SIZE_SETTER;}
+                                       rel2{relative: 0.943 0.621; to: SIZE_SETTER;}
                                }
                        }
                        part { name: CLUSTER_BOX;

diff --git a/src/cluster_page.c b/src/cluster_page.c
index 14f098a..21e92ef 100755 (executable)
--- a/src/cluster_page.c
+++ b/src/cluster_page.c
@@ -38,11 +38,10 @@ cluster_page_t *cluster_page_new(Evas_Object* parent)
        elm_layout_file_set(page_t->page_layout, util_get_res_file_path(EDJE_DIR"/cluster_page.edj"), GROUP_CLUSTER_PAGE_LY);
        evas_object_size_hint_align_set(page_t->page_layout, 0, 0);
        evas_object_size_hint_weight_set(page_t->page_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_resize(page_t->page_layout, CLUSTER_W, CLUSTER_H);
        evas_object_show(page_t->page_layout);
 
        Evas_Object *page_bg = evas_object_rectangle_add(evas_object_evas_get(page_t->page_layout));
-       evas_object_size_hint_min_set(page_bg, CLUSTER_W, CLUSTER_H);
+       evas_object_size_hint_min_set(page_bg, CLUSTER_VIEW_W, CLUSTER_VIEW_H);
        evas_object_size_hint_align_set(page_bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(page_bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_color_set(page_bg, 0, 0, 0, 0);

diff --git a/src/cluster_view.c b/src/cluster_view.c
index 8289458..c15047b 100755 (executable)
--- a/src/cluster_view.c
+++ b/src/cluster_view.c
@@ -226,7 +226,7 @@ Evas_Object *__cluster_view_create_base_gui(Evas_Object *win)
        evas_object_resize(cluster_view_s.scroller, CLUSTER_VIEW_W, CLUSTER_VIEW_H);
 
        elm_scroller_loop_set(cluster_view_s.scroller, EINA_TRUE, EINA_FALSE);
-       elm_scroller_page_size_set(cluster_view_s.scroller, CLUSTER_W , CLUSTER_H);
+       elm_scroller_page_size_set(cluster_view_s.scroller, CLUSTER_VIEW_W , CLUSTER_VIEW_H);
 
        evas_object_event_callback_add(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_DOWN, __clsuter_view_scroller_down_cb, NULL);
        evas_object_event_callback_add(cluster_view_s.scroller, EVAS_CALLBACK_MOUSE_MOVE, __clsuter_view_scroller_move_cb, NULL);