merge with master

[apps/core/preloaded/myfiles.git] / src / include / mf-gengrid.h

diff --git a/src/include/mf-gengrid.h b/src/include/mf-gengrid.h
index 6bdb6f5..e07161f 100644 (file)
--- a/src/include/mf-gengrid.h
+++ b/src/include/mf-gengrid.h
@@ -19,25 +19,24 @@
 #ifndef __DEF_MYFILE_GENGRID_H
 #define __DEF_MYFILE_GENGRID_H
 
+#include "mf-util.h"
+
 #define MF_LANDSCAPE_GENGRID_ITEM_WIDTH                118
 #define MF_LANDSCAPE_GENGRID_ITEM_HEIGTH       161
 
-#define MF_SCALE_FACTORY                       elm_config_scale_get()
 #define MF_ICON_SIZE                           (165*MF_SCALE_FACTORY)
 
 
-#define MF_WVGA_GENGRID_ITEM_WIDTH             (184*MF_SCALE_FACTORY)
-
-#define MF_WVGA_GENGRID_ITEM_HEIGTH            (240*MF_SCALE_FACTORY)
 
 
-#define MF_HD_GENGRID_ITEM_WIDTH               (int)((8*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(8*MF_SCALE_FACTORY))
+#define MF_HD_GENGRID_ITEM_WIDTH               177*MF_SCALE_FACTORY //(int)((8*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(8*MF_SCALE_FACTORY))
 
-#define MF_HD_GENGRID_ITEM_HEIGTH              (int)((18*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(72*MF_SCALE_FACTORY))
+#define MF_HD_GENGRID_ITEM_HEIGTH              (177 + 64)*MF_SCALE_FACTORY//(int)((18*MF_SCALE_FACTORY)+(164*MF_SCALE_FACTORY)+(72*MF_SCALE_FACTORY))
 
 void mf_gengrid_create_grid_items(void *data, Evas_Object *grid, Eina_List *file_list);
 
-Evas_Object *mf_gengrid_create_grid (Evas_Object *parent);
+Evas_Object *mf_gengrid_create_grid(Evas_Object *parent);
+Evas_Object *mf_gengrid_create(Evas_Object *parent);
 
 void mf_gengrid_refresh(void *data);
 void mf_gengrid_get_grid_selected_files(Evas_Object *gengrid, Eina_List **list);