delete ShowPreviewBarFinish callback function

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

diff --git a/include/common/define.h b/include/common/define.h
index 61556f1..0546802 100644 (file)
--- a/include/common/define.h
+++ b/include/common/define.h
@@ -110,7 +110,6 @@
 #define SIG_MENU_SHOW_FINISH "menu,show,finish"
 #define SIG_MENU_HIDE "menu,hide"
 #define SIG_PREVIEWBAR_SHOW "previewbar,show"
-#define SIG_PREVIEWBAR_SHOW_FINISH "previewbar,show,finish"
 #define SIG_PREVIEWBAR_HIDE "previewbar,hide"
 #define SIG_UPARROW_SHOW "uparrow,show"
 #define SIG_UPARROW_HIDE "uparrow,hide"

diff --git a/include/view/photo-viewer/photoviewer_view.h b/include/view/photo-viewer/photoviewer_view.h
index 6b6cc68..bc52efb 100644 (file)
--- a/include/view/photo-viewer/photoviewer_view.h
+++ b/include/view/photo-viewer/photoviewer_view.h
@@ -84,8 +84,6 @@ private:
 
        static void sm_CbShowMenuViewFinish(void *dt, Evas_Object *obj,
                        const char *emission, const char *source);
-       static void sm_CbShowPreviewBarFinish(void *dt, Evas_Object *obj,
-                       const char *emission, const char *source);
 
        static Eina_Bool sm_CbTimerSlideshow(void *dt);
 
@@ -95,7 +93,7 @@ private:
        bool m_DrawPreviewBar(void);
        bool m_DrawPreviewBarItem(void);
        bool m_DrawPreviewBarBorder(void);
-       bool m_UpdatePreviewBar(void);
+       bool m_UpdatePreviewBar(int direction);
        Evas_Object *m_MovePreviewBar(int new_x,
                        int unpack_item_idx, int new_item_idx);
        bool m_DrawBottomArea(void);

diff --git a/res/edc/views/photoviewer_view.edc b/res/edc/views/photoviewer_view.edc
index 4c12266..2894f73 100644 (file)
--- a/res/edc/views/photoviewer_view.edc
+++ b/res/edc/views/photoviewer_view.edc
@@ -542,11 +542,6 @@ group {
                        action: STATE_SET "bottom" 0.0;
                        target: "padding_previewbar";
                        transition: LINEAR 0.2;
-                       after: "emit,previewbar_signal";
-               }
-               program {
-                       name: "emit,previewbar_signal";
-                       action: SIGNAL_EMIT SIG_PREVIEWBAR_SHOW_FINISH "";
                }
        }
 }

diff --git a/src/view/photo-viewer/photoviewer_view.cpp b/src/view/photo-viewer/photoviewer_view.cpp
index 31856bb..ad3e95f 100644 (file)
--- a/src/view/photo-viewer/photoviewer_view.cpp
+++ b/src/view/photo-viewer/photoviewer_view.cpp
@@ -86,7 +86,6 @@ struct SPhotoViewerView {
 
        Evas_Object *pvbar_box;
        Evas_Object *pvbar_scr;
-       int pvbar_dir;
 
        Ecore_Timer *tooltip_timer;
        Ecore_Timer *pvbar_timer;
@@ -169,18 +168,18 @@ void CPhotoViewerView::m_OnPrevBtnClicked(Evas_Object *obj,
        if (!m_DrawTopArea(minfo))
                return;
 
-       m->pvbar_dir = PREVIEWBAR_TO_PREV;
+       if (!m_UpdatePreviewBar(PREVIEWBAR_TO_PREV))
+               return;
+
        if (!m->menu_show) {
-               if (m->pvbar_timer) {
+               if (m->pvbar_timer)
                        ecore_timer_reset(m->pvbar_timer);
-                       m_UpdatePreviewBar();
-               } else {
+               else {
                        m->pvbar_timer = ecore_timer_add(TIMEOUT_PREVIEWBAR,
                                                sm_CbTimerPreviewBar, this);
                        elm_object_signal_emit(m->base, SIG_PREVIEWBAR_SHOW, "");
                }
-       } else
-               m_UpdatePreviewBar();
+       }
 
        m->vd->minfo = minfo;
 }
@@ -223,18 +222,18 @@ void CPhotoViewerView::m_OnNextBtnClicked(Evas_Object *obj,
        if (!m_DrawTopArea(minfo))
                return;
 
-       m->pvbar_dir = PREVIEWBAR_TO_NEXT;
+       if (!m_UpdatePreviewBar(PREVIEWBAR_TO_NEXT))
+               return;
+
        if (!m->menu_show) {
-               if (m->pvbar_timer) {
+               if (m->pvbar_timer)
                        ecore_timer_reset(m->pvbar_timer);
-                       m_UpdatePreviewBar();
-               } else {
+               else {
                        m->pvbar_timer = ecore_timer_add(TIMEOUT_PREVIEWBAR,
                                                sm_CbTimerPreviewBar, this);
                        elm_object_signal_emit(m->base, SIG_PREVIEWBAR_SHOW, "");
                }
-       } else
-               m_UpdatePreviewBar();
+       }
 
        m->vd->minfo = minfo;
 }
@@ -722,7 +721,7 @@ bool CPhotoViewerView::m_DrawPreviewBarBorder(void)
        return true;
 }
 
-bool CPhotoViewerView::m_UpdatePreviewBar(void)
+bool CPhotoViewerView::m_UpdatePreviewBar(int direction)
 {
        Evas_Object *ly;
        int new_item_idx;
@@ -730,7 +729,7 @@ bool CPhotoViewerView::m_UpdatePreviewBar(void)
 
        elm_scroller_region_get(m->pvbar_scr, &x, &y, &w, &h);
 
-       if (m->pvbar_dir == PREVIEWBAR_TO_PREV) {
+       if (direction == PREVIEWBAR_TO_PREV) {
                new_item_idx = m->current_idx - PREVIEWBAR_CENTER_IDX;
                if (new_item_idx < 0)
                        new_item_idx += m->totalcount;
@@ -742,7 +741,7 @@ bool CPhotoViewerView::m_UpdatePreviewBar(void)
 
                elm_box_pack_start(m->pvbar_box, ly);
                evas_object_show(ly);
-       } else if (m->pvbar_dir == PREVIEWBAR_TO_NEXT) {
+       } else if (direction == PREVIEWBAR_TO_NEXT) {
                new_item_idx = m->current_idx + PREVIEWBAR_CENTER_IDX;
                if (new_item_idx > m->totalcount - 1)
                        new_item_idx -= m->totalcount;
@@ -894,15 +893,6 @@ void CPhotoViewerView::m_HideMenuView(void)
        }
 }
 
-void CPhotoViewerView::sm_CbShowPreviewBarFinish(void *dt, Evas_Object *obj,
-               const char *emission, const char *source)
-{
-       CPhotoViewerView *root = (CPhotoViewerView *)dt;
-
-       if (root)
-               root->m_UpdatePreviewBar();
-}
-
 bool CPhotoViewerView::m_DrawItems(void)
 {
        if (!m->vd)
@@ -1011,8 +1001,6 @@ bool CPhotoViewerView::Create(void *data)
 
        elm_object_signal_callback_add(m->base, SIG_MENU_SHOW_FINISH, "",
                                sm_CbShowMenuViewFinish, this);
-       elm_object_signal_callback_add(m->base, SIG_PREVIEWBAR_SHOW_FINISH, "",
-                               sm_CbShowPreviewBarFinish, this);
 
        /* temp hot fix */
        m->focus_timer = ecore_timer_add(0.25, sm_CbFocus, this);