apply CCtxPopup in application-common

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

diff --git a/include/common/define.h b/include/common/define.h
index e4628d8..3638913 100644 (file)
--- a/include/common/define.h
+++ b/include/common/define.h
@@ -121,8 +121,6 @@
 #define STYLE_FOLDERITEM "folderitem"
 #define STYLE_EVENTITEM "eventitem"
 #define STYLE_INVISIBLE "invisible"
-#define STYLE_CTXPOPUP_VIEWER "viewer_popup"
-#define STYLE_CTXPOPUP_HOVER "hover_popup"
 #define STYLE_BTN_SHORTTEXT "shorttext"
 #define STYLE_BTN_LONGTEXT "longtext"
 #define STYLE_BTN_HOVERTEXT "hovertext"

diff --git a/res/edc/gallery-tv-ref-theme.edc b/res/edc/gallery-tv-ref-theme.edc
index 9731989..d20223e 100644 (file)
--- a/res/edc/gallery-tv-ref-theme.edc
+++ b/res/edc/gallery-tv-ref-theme.edc
@@ -5,6 +5,5 @@ collections {
        #include "widgets/button.edc"
        #include "widgets/gengrid.edc"
        #include "widgets/tooltip.edc"
-       #include "widgets/ctxpopup.edc"
        #include "widgets/photocam.edc"
 }

diff --git a/res/edc/widgets/ctxpopup.edc b/res/edc/widgets/ctxpopup.edc
deleted file mode 100755 (executable)
index c9432e4..0000000
--- a/res/edc/widgets/ctxpopup.edc
+++ /dev/null
@@ -1,60 +0,0 @@
-group {
-       name: "elm/ctxpopup/base/viewer_popup";
-       images {
-               image: IMAGE_TOOLTIP_ARROW COMP;
-       }
-       parts {
-               part {
-                       name: "elm.swallow.content";
-                       type: SWALLOW;
-                       description {
-                               state: "default" 0.0;
-                       }
-               }
-               part {
-                       name: "ctxpopup_arrow";
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                               min: 14 9;
-                               fixed: 1 1;
-                               rel1 {
-                                       to: "elm.swallow.content";
-                                       relative: 0.5 1;
-                               }
-                               rel2 {
-                                       to: "elm.swallow.content";
-                                       relative: 0.5 1;
-                               }
-                               align: 0.5 0.0;
-                               image.normal: IMAGE_TOOLTIP_ARROW;
-                               color: 255 255 255 255;
-                       }
-               }
-       }
-}
-
-group {
-       name: "elm/ctxpopup/base/hover_popup";
-       parts {
-               part {
-                       name: "elm.swallow.content";
-                       type: SWALLOW;
-                       description {
-                               state: "default" 0.0;
-                       }
-               }
-       }
-}
-
-group { name: "elm/ctxpopup/arrow/default";
-       parts {
-               part {
-                       name: "ctxpopup_arrow";
-                       scale: 1;
-                       description {
-                               state: "default" 0.0;
-                       }
-               }
-       }
-}

diff --git a/src/view/gallery-view/SortCtxPopup.cpp b/src/view/gallery-view/SortCtxPopup.cpp
index eec0fa9..8f86f31 100644 (file)
--- a/src/view/gallery-view/SortCtxPopup.cpp
+++ b/src/view/gallery-view/SortCtxPopup.cpp
@@ -66,7 +66,7 @@ void CSortCtxPopup::t_OnConfiguration(void)
        t_SetList(sorttext, SORT_TEXT_SIZE, GetCb->cb(GetCb->cookie),
                        CCtxPopup::TOPBTN_SORT, sort_btn_id,
                        POSITION_SORT_POPUP_X, POSITION_SORT_POPUP_Y,
-                       STYLE_CTXPOPUP_HOVER,
+                       NULL,
                        STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT);
 }
 

diff --git a/src/view/gallery-view/SourceCtxPopup.cpp b/src/view/gallery-view/SourceCtxPopup.cpp
index 519ff0d..35e1c5b 100644 (file)
--- a/src/view/gallery-view/SourceCtxPopup.cpp
+++ b/src/view/gallery-view/SourceCtxPopup.cpp
@@ -65,7 +65,7 @@ void CSourceCtxPopup::t_OnConfiguration(void)
        t_SetList(sourcetext, SOURCE_TEXT_SIZE, GetCb->cb(GetCb->cookie),
                        CCtxPopup::TOPBTN_SOURCE, source_btn_id,
                        POSITION_SOURCE_POPUP_X, POSITION_SOURCE_POPUP_Y,
-                       STYLE_CTXPOPUP_HOVER,
+                       NULL,
                        STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT, STYLE_BTN_HOVERTEXT);
 }
 

diff --git a/src/view/photo-viewer/SettingCtxPopup.cpp b/src/view/photo-viewer/SettingCtxPopup.cpp
index 37e6691..185850a 100644 (file)
--- a/src/view/photo-viewer/SettingCtxPopup.cpp
+++ b/src/view/photo-viewer/SettingCtxPopup.cpp
@@ -63,7 +63,7 @@ void CSettingCtxPopup::t_OnConfiguration(void)
        t_SetList(speed_text, MAX_SPEED_BTNS, GetCb->cb(GetCb->cookie),
                        CCtxPopup::TOPBTN_BASE, speed_btn_id,
                        POSITION_SETTING_POPUP_X, POSITION_SETTING_POPUP_Y,
-                       STYLE_CTXPOPUP_VIEWER,
+                       NULL,
                        STYLE_BTN_SHORTTEXT, STYLE_BTN_SHORTTEXT, STYLE_BTN_SHORTTEXT);
 }
 

diff --git a/src/view/photo-viewer/ZoomCtxPopup.cpp b/src/view/photo-viewer/ZoomCtxPopup.cpp
index 00fb6d6..0104380 100644 (file)
--- a/src/view/photo-viewer/ZoomCtxPopup.cpp
+++ b/src/view/photo-viewer/ZoomCtxPopup.cpp
@@ -48,7 +48,7 @@ void CZoomCtxPopup::t_OnConfiguration(void)
        t_SetList(zoom_text, MAX_ZOOM_BTNS, E_ZOOM_ORIGINAL,
                        CCtxPopup::TOPBTN_BASE, zoom_btn_id,
                        POSITION_ZOOM_POPUP_X, POSITION_ZOOM_POPUP_Y,
-                       STYLE_CTXPOPUP_VIEWER,
+                       NULL,
                        STYLE_BTN_SHORTTEXT, STYLE_BTN_SHORTTEXT, STYLE_BTN_SHORTTEXT);
 }
 

diff --git a/src/view/photo-viewer/photoviewer_view.cpp b/src/view/photo-viewer/photoviewer_view.cpp
index b0ff4b9..4cf4a2e 100644 (file)
--- a/src/view/photo-viewer/photoviewer_view.cpp
+++ b/src/view/photo-viewer/photoviewer_view.cpp
@@ -247,6 +247,9 @@ void CPhotoViewerView::m_OnSettingBtnClicked(Evas_Object *obj, const char *emiss
        pCtxPopup->RegisterSetCallback(sm_CbSetSlideshowSpeed, m);
        m->pCtxPopup = pCtxPopup;
        pCtxPopup->Create(m->base, &cb);
+
+       m->tooltip_timer = NULL;
+       elm_object_tooltip_hide(m->focusedbtn);
 }
 
 
@@ -274,6 +277,9 @@ void CPhotoViewerView::m_OnZoomBtnClicked(Evas_Object *obj, const char *emission
        pCtxPopup->RegisterSetCallback(sm_CbSetZoomLevel, m);
        m->pCtxPopup = pCtxPopup;
        pCtxPopup->Create(m->base, &cb);
+
+       m->tooltip_timer = NULL;
+       elm_object_tooltip_hide(m->focusedbtn);
 }