Move the elm_gengrid code to utils and remove the scrollbar

Change-Id: Idffbd2618f259aa66e45c5eb744089069fcb10b9
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/include/utils.h b/include/utils.h
index 504a712..e550a8e 100644 (file)
--- a/include/utils.h
+++ b/include/utils.h
@@ -24,6 +24,7 @@ Evas_Object *utils_add_box(Evas_Object *parent, const char *part,
                Evas_Coord padding_v);
 Evas_Object *utils_add_button(Evas_Object *parent, const char *part,
                const char *text, const char *style);
+Evas_Object *utils_add_gengrid(Evas_Object *parent);
 bool utils_launch_app(const char *appid);
 
 #endif /* __AIR_APPS_UTILS_H__ */

diff --git a/src/utils.c b/src/utils.c
index f6db627..1eff322 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -18,6 +18,7 @@
 #include <app_control.h>
 #include <app_debug.h>
 
+#include "define.h"
 #include "utils.h"
 
 Evas_Object *utils_add_window(const char *name)
@@ -127,6 +128,38 @@ Evas_Object *utils_add_button(Evas_Object *parent, const char *part,
        return btn;
 }
 
+Evas_Object *utils_add_gengrid(Evas_Object *parent)
+{
+       Evas_Object *grid;
+
+       if (!parent) {
+               _ERR("Invalid argument.");
+               return NULL;
+       }
+
+       grid = elm_gengrid_add(parent);
+       if (!grid) {
+               _ERR("elm_gengrid_add failed.");
+               return NULL;
+       }
+
+       evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND,
+                       EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+       elm_gengrid_multi_select_set(grid, EINA_FALSE);
+       elm_gengrid_horizontal_set(grid, EINA_TRUE);
+       elm_gengrid_align_set(grid, 0.0, 0.0);
+       elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
+       elm_gengrid_item_size_set(grid,
+                       elm_config_scale_get() * SIZE_GRID_WIDTH,
+                       elm_config_scale_get() * SIZE_GRID_HEIGHT);
+       elm_scroller_policy_set(grid, ELM_SCROLLER_POLICY_OFF,
+                       ELM_SCROLLER_POLICY_OFF);
+
+       return grid;
+}
+
 bool utils_launch_app(const char *appid)
 {
        app_control_h app_ctrl;

diff --git a/src/view/view_base.c b/src/view/view_base.c
index 2ce9e56..dc2f7de 100644 (file)
--- a/src/view/view_base.c
+++ b/src/view/view_base.c
@@ -749,24 +749,12 @@ static Evas_Object *_add_grid(struct _priv *priv)
                return NULL;
        }
 
-       grid = elm_gengrid_add(priv->base);
+       grid = utils_add_gengrid(priv->base);
        if (!grid) {
-               _ERR("elm_gengrid_add failed.");
+               _ERR("Add gengrid failed.");
                return NULL;
        }
 
-       evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND,
-                       EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-       elm_gengrid_multi_select_set(grid, EINA_FALSE);
-       elm_gengrid_horizontal_set(grid, EINA_TRUE);
-       elm_gengrid_align_set(grid, 0.0, 0.0);
-       elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
-       elm_gengrid_item_size_set(grid,
-                       elm_config_scale_get() * SIZE_GRID_WIDTH,
-                       elm_config_scale_get() * SIZE_GRID_HEIGHT);
-
        inputmgr_add_callback(grid, 0, &_grid_input_handler, priv);
 
        gclass = get_myapps_grid_class();