modify the size of image in the middle of preview bar

Change-Id: I1a7fbb6e29ada550ee33b15c119d0de6935525d0
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/include/common/define.h b/include/common/define.h
index 0546802..f7a0c45 100644 (file)
--- a/include/common/define.h
+++ b/include/common/define.h
@@ -92,7 +92,8 @@
 #define GRP_ZOOM_VIEW "zoom_view"
 #define GRP_ZOOM_NAVI "zoom_navi"
 #define GRP_PREVIEWBAR "previewbar"
-#define GRP_PREVIEWBAR_ITEM "previewbar_item"
+#define GRP_PREVIEWBAR_ITEM_NORMAL "previewbar_item,normal"
+#define GRP_PREVIEWBAR_ITEM_CENTER "previewbar_item,center"
 
 /* Signal definitions */
 #define SIG_SELECTED "selected"
@@ -210,7 +211,7 @@
 #define SIZE_BTN_LABEL_WIDTH 103
 #define SIZE_CONTENT_LABEL_WIDTH 550
 
-#define SIZE_PREVIEWBAR_ITEM_W 140
+#define SIZE_PREVIEWBAR_ITEM_W 135
 
 #define CTXT_MENU_GENGRID_ITEM_SIZE_W (238+14)
 #define CTXT_MENU_GENGRID_ITEM_SIZE_H (293+14)

diff --git a/res/edc/views/photoviewer_view.edc b/res/edc/views/photoviewer_view.edc
index 2894f73..f98029b 100644 (file)
--- a/res/edc/views/photoviewer_view.edc
+++ b/res/edc/views/photoviewer_view.edc
@@ -323,7 +323,7 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 614 274;
+                               min: 605 289;
                                rel1.relative: 0.0 1.0;
                                rel2.relative: 0.0 1.0;
                                fixed: 1 1;
@@ -332,12 +332,12 @@ group {
                        description {
                                state: "bottom" 0.0;
                                inherit: "default" 0.0;
-                               min: 614 150;
+                               min: 605 180;
                        }
                        description {
                                state: "hide" 0.0;
                                inherit: "default" 0.0;
-                               min: 614 0;
+                               min: 605 0;
                        }
                }
                part {
@@ -346,7 +346,7 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 700 120;
+                               min: 710 150;
                                rel1 {
                                        to: "padding_previewbar";
                                        relative: 1.0 0.0;
@@ -365,7 +365,7 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 140 120;
+                               min: 170 150;
                                rel1 {
                                        to: PART_PREVIEWBAR;
                                        relative: 0.5 0.5;
@@ -555,7 +555,7 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 700 120;
+                               min: 710 150;
                                visible, 0;
                        }
                }
@@ -567,7 +567,7 @@ group {
                                state: "default" 0.0;
                                rel1.relative: 0.5 0.0;
                                rel2.relative: 0.5 0.0;
-                               min: 700 120;
+                               min: 710 150;
                                fixed: 1 1;
                                align: 0.5 0.0;
                        }
@@ -576,7 +576,7 @@ group {
 }
 
 group {
-       name: GRP_PREVIEWBAR_ITEM;
+       name: GRP_PREVIEWBAR_ITEM_NORMAL;
        parts {
                part {
                        name: "area";
@@ -584,7 +584,7 @@ group {
                        scale: 1;
                        description {
                                state: "default" 0.0;
-                               min: 140 120;
+                               min: 135 115;
                                visible, 0;
                        }
                }
@@ -596,7 +596,7 @@ group {
                                state, "default" 0.0;
                                rel1.relative: 0.5 0.0;
                                rel2.relative: 0.5 0.0;
-                               min: 140 120;
+                               min: 135 115;
                                fixed: 1 1;
                                align: 0.5 0.0;
                                color: 0 0 0 255;
@@ -610,7 +610,51 @@ group {
                                state: "default" 0.0;
                                rel1.relative: 0.5 0.0;
                                rel2.relative: 0.5 0.0;
-                               min: 140 120;
+                               min: 135 115;
+                               fixed: 1 1;
+                               align: 0.5 0.0;
+                               color: 255 255 255 30;
+                       }
+               }
+       }
+}
+
+group {
+       name: GRP_PREVIEWBAR_ITEM_CENTER;
+       parts {
+               part {
+                       name: "area";
+                       type: RECT;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               min: 170 150;
+                               visible, 0;
+                       }
+               }
+               part {
+                       name: "img_bg";
+                       type: RECT;
+                       scale: 1;
+                       description {
+                               state, "default" 0.0;
+                               rel1.relative: 0.5 0.0;
+                               rel2.relative: 0.5 0.0;
+                               min: 170 150;
+                               fixed: 1 1;
+                               align: 0.5 0.0;
+                               color: 0 0 0 255;
+                       }
+               }
+               part {
+                       name: PART_PREVIEWBAR_IMG;
+                       type: SWALLOW;
+                       scale: 1;
+                       description {
+                               state: "default" 0.0;
+                               rel1.relative: 0.5 0.0;
+                               rel2.relative: 0.5 0.0;
+                               min: 170 150;
                                fixed: 1 1;
                                align: 0.5 0.0;
                                color: 255 255 255 30;

diff --git a/src/view/photo-viewer/photoviewer_view.cpp b/src/view/photo-viewer/photoviewer_view.cpp
index fd6e4ca..1c0cc5b 100644 (file)
--- a/src/view/photo-viewer/photoviewer_view.cpp
+++ b/src/view/photo-viewer/photoviewer_view.cpp
@@ -673,7 +673,13 @@ bool CPhotoViewerView::m_DrawPreviewBarItem(void)
                if (!ly)
                        return false;
 
-               elm_layout_file_set(ly, EDJEFILE, GRP_PREVIEWBAR_ITEM);
+               if (i == PREVIEWBAR_CENTER_IDX) {
+                       elm_layout_file_set(ly, EDJEFILE,
+                                       GRP_PREVIEWBAR_ITEM_CENTER);
+               } else {
+                       elm_layout_file_set(ly, EDJEFILE,
+                                       GRP_PREVIEWBAR_ITEM_NORMAL);
+               }
 
                img = elm_image_add(ly);
                if (!img)
@@ -785,6 +791,19 @@ Evas_Object *CPhotoViewerView::m_MovePreviewBar(int new_x,
 
        pvbar_item = elm_box_children_get(m->pvbar_box);
 
+       ly = (Evas_Object *)eina_list_nth(pvbar_item, PREVIEWBAR_CENTER_IDX);
+       elm_layout_file_set(ly, EDJEFILE, GRP_PREVIEWBAR_ITEM_NORMAL);
+
+       if (unpack_item_idx == 0) {
+               ly = (Evas_Object *)eina_list_nth(pvbar_item,
+                                       PREVIEWBAR_CENTER_IDX + 1);
+               elm_layout_file_set(ly, EDJEFILE, GRP_PREVIEWBAR_ITEM_CENTER);
+       } else {
+               ly = (Evas_Object *)eina_list_nth(pvbar_item,
+                                       PREVIEWBAR_CENTER_IDX - 1);
+               elm_layout_file_set(ly, EDJEFILE, GRP_PREVIEWBAR_ITEM_CENTER);
+       }
+
        ly = (Evas_Object *)eina_list_nth(pvbar_item, unpack_item_idx);
        elm_box_unpack(m->pvbar_box, ly);
        evas_object_hide(ly);