[TIZENIOT-2037]Space between rows is placed as per GUI guideline in albums

Change-Id: Ibe898fbb30db0174f6a6cdc22ce9854e203cc27c
Signed-off-by: mohitkr1 <mohit.kr1@samsung.com>

diff --git a/res/edje/gl-gengrid-item-thumbview.edc b/res/edje/gl-gengrid-item-thumbview.edc
index 4ead5643c57c2216578f8b224b4cadef28433182..e25c8f9acbc641cba76de4b40a4a18e2efcf375e 100755 (executable)
--- a/res/edje/gl-gengrid-item-thumbview.edc
+++ b/res/edje/gl-gengrid-item-thumbview.edc
@@ -142,7 +142,7 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.5 0.5;
-                               visible: 0;
+                               visible: 1;
                                color: 0 0 0 0;
                        }
                }
@@ -407,7 +407,7 @@ group {
                        description {
                                state: "default" 0.0;
                                align: 0.5 0.5;
-                               visible: 0;
+                               visible: 1;
                                color: 0 0 0 0;
                        }
                }
@@ -419,9 +419,9 @@ group {
                                state: "default" 0.0;
                                align: 0.5 0.5;
                                visible: 1;
-                               rel1{relative: 3/(280+24) 4.5/(280+96);}
-                               rel2{relative: (280-3)/(280+24) (280-4.5)/(280+96); }
-                               color: 255 255 255 255;
+                               rel1{relative: 0.0 0.0;}
+                               rel2{relative: 0.93 0.93;}
+                               color: 255 255 255 0;
                        }
                }
                part {
@@ -432,32 +432,29 @@ group {
                                state: "default" 0.0;
                                color: 0 0 0 0;
                                rel1{relative: 0.0 0.0;}
-                               rel2{relative: 280/(280+24) 280/(280+96);}
+                               rel2{relative: 0.93 0.93;}
+                               min: 0 100;
                        }
                }
                part {
-                       name: "elm.swallow.mode";
+                       name: "elm.text.name.swallow";
                        type: SWALLOW;
-                       repeat_events: 1;
                        description {
                                state: "default" 0.0;
-                               rel1 {relative: 1.0 0.0; to_x: "padding.end.left2"; to_y: "padding.end.top2"; }
-                               rel2 {relative: 1.0 0.0; to_x: "padding.end.right2"; to_y: "padding.end.bottom2"; }
+                               rel1 { relative: 0.08 0.8; to: "elm.swallow.icon";}
+                               rel2 { relative: 0.9 .93; to: "elm.swallow.icon";}
+                               color: 0 0 0 255;
+                               align: 0.5 1.0;
                        }
                }
                part {
-                       name: "elm.text.name.swallow";
+                       name: "elm.swallow.mode";
                        type: SWALLOW;
-                       mouse_events: 1;
                        repeat_events: 1;
-                       scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 0 14;
-                               max: -1 28;
-                               rel1 { to: "elm.swallow.icon"; relative: 0.0 1.0; offset: 8 -3;}
-                               rel2 { to: "elm.swallow.icon"; relative: 1.0 1.0; offset: -8 -11;}
-                               align: 0.0 1.0;
+                               rel1 {relative: 1.0 0.0; to_x: "padding.end.left2"; to_y: "padding.end.top2"; }
+                               rel2 {relative: 1.0 0.0; to_x: "padding.end.right2"; to_y: "padding.end.bottom2"; }
                        }
                }
                GL_GENGRID_FOCUS_BG
@@ -466,8 +463,8 @@ group {
                        type: SWALLOW;
                        description {
                                state: "default" 0.0;
-                               rel1 {relative: 0.95 0.9; to_x: "padding.end.left"; to_y: "padding.end.top"; }
-                               rel2 {relative: 0.95 0.9; to_x: "padding.end.right"; to_y: "padding.end.bottom"; }
+                               rel1 {relative: 0.96 0.85; to_x: "padding.end.left"; to_y: "padding.end.top"; }
+                               rel2 {relative: 0.96 0.85; to_x: "padding.end.right"; to_y: "padding.end.bottom"; }
                        }
                }
                part {
@@ -478,8 +475,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 1;
-                               rel1 {relative: 0.115 0.135; to: elm.swallow.icon; }
-                               rel2 {relative: 0.115 0.135; to: elm.swallow.icon; }
+                               rel1 { relative: 0.03 0.0585; to: "elm.swallow.icon"; }
+                               rel2 { relative: 0.23 0.2585; to: "elm.swallow.icon"; }
                                min: 36 36;
                                max: 36 36;
                                color: 0 0 0 0;
@@ -533,8 +530,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 1;
-                               rel1 {relative: 0 1; offset: 8 -102; to: bg; }
-                               rel2 {relative: 0 1; offset: 34 -76; to: bg; }
+                               rel1 {relative: 0 1; offset: 8 -42; to: "elm.swallow.icon"; }
+                               rel2 {relative: 0 1; offset: 42 -8; to: "elm.swallow.icon"; }
                                min: 36 36;
                                max: 36 36;
                                color: 0 0 0 0;
@@ -590,8 +587,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 1;
-                               rel1 {relative: 0 0.55; to: bg; }
-                               rel2 {relative: 0.45 1.0; to: bg; }
+                               rel1 {relative: 0 0.55; to: "elm.swallow.icon"; }
+                               rel2 {relative: 0.45 1.0; to: "elm.swallow.icon"; }
                        }
                }
                part {
@@ -602,8 +599,8 @@ group {
                        description {
                                state: "default" 0.0;
                                visible: 1;
-                               rel1 {relative: 0 0.55; to: bg; }
-                               rel2 {relative: 0.45 1.0; to: bg; }
+                               rel1 {relative: 0 0.55; to: "elm.swallow.icon"; }
+                               rel2 {relative: 0.45 1.0; to: "elm.swallow.icon"; }
                        }
                }
        }
@@ -708,7 +705,7 @@ group \
                                state: "default" 0.0; \
                                rel1 { relative: 0.0 0.0;} \
                                rel2 { relative: 1.0 1.0;} \
-                               color: 0 0 0 0; \
+                               color: 255 255 255 0; \
                        } \
                } \
                part { \
@@ -859,7 +856,7 @@ group \
                                state: "default" 0.0; \
                                rel1 { relative: 0.0 0.0;} \
                                rel2 { relative: 1.0 1.0;} \
-                               color: 255 255 255 255; \
+                               color: 255 255 255 0; \
                        } \
                } \
                part { \
@@ -920,7 +917,7 @@ group \
                                state: "default" 0.0; \
                                rel1 { relative: 0.0 0.0;} \
                                rel2 { relative: 1.0 1.0;} \
-                               color: 255 255 255 255; \
+                               color: 255 255 255 0; \
                        } \
                } \
                part { \

diff --git a/src/widget/gl-thumb.c b/src/widget/gl-thumb.c
index f657b48f0c2dbc1ce9fc14d4cc54fbbc925169f4..8734f74d893e4459ac0c746f445d858d271a24a7 100755 (executable)
--- a/src/widget/gl-thumb.c
+++ b/src/widget/gl-thumb.c
@@ -60,6 +60,7 @@
 #define GL_PHOTOFRAME_BURSTSHOT1 "burstshot1"
 #define GL_PHOTOFRAME_BURSTSHOT2 "burstshot2"
 
+#define GL_GRID_DEFAULT 200
 /**
  *
  * @param parent
@@ -297,8 +298,8 @@ int _gl_thumb_set_size(void *data, Evas_Object * view, int *size_w,
                _w_l = (int) (win_h / GL_GRID_7_PER_ROW);
        } else if (ad->pinchinfo.zoom_level == GL_ZOOM_DEFAULT) {
                gl_dbg("GL_ZOOM_DEFAULT");
-               _w = 200;
-               _h = 240;
+               _w = GL_GRID_DEFAULT;
+               _h = GL_GRID_DEFAULT;
                _w_l = (int) (win_h / GL_GRID_6_PER_ROW);
        } else {
                /* Set size same as ZOOM_IN_TWO except zoom_in_one and default level */
@@ -372,8 +373,8 @@ int _gl_thumb_split_set_size(void *data, Evas_Object * view)
        gl_dbg("rotate_mode: %d, zoom level: %d, scale : %f", rotate_mode,
                   ad->pinchinfo.zoom_level, scale);
 
-       _w = (int) ((2 * win_w) / (2.5 * GL_GRID_5_PER_ROW));
-       _h = _w + 40;
+       _w = GL_GRID_DEFAULT;
+       _h = GL_GRID_DEFAULT;
        _w_l = (int) ((win_h - win_w / 3) / GL_GRID_5_PER_ROW);
        _h_l = _w_l;