destroy ctxpopup when already selected item is clicked

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

diff --git a/src/view/gallery-view/SortCtxPopup.cpp b/src/view/gallery-view/SortCtxPopup.cpp
index 8f86f31..1047fd9 100644 (file)
--- a/src/view/gallery-view/SortCtxPopup.cpp
+++ b/src/view/gallery-view/SortCtxPopup.cpp
@@ -87,11 +87,13 @@ void CSortCtxPopup::t_OnBtnClicked(Evas_Object *obj, void  *ev)
                        break;
        }
 
-       if (i == SORT_TEXT_SIZE || i == GetCb->cb(GetCb->cookie))
+       if (i == SORT_TEXT_SIZE)
                return;
 
-       SetCb->cb(SetCb->cookie, i);
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       if (i != GetCb->cb(GetCb->cookie)) {
+               SetCb->cb(SetCb->cookie, i);
+               CCtxPopup::t_OnBtnClicked(obj, ev);
+       }
 
        Destroy();
 }

diff --git a/src/view/gallery-view/SourceCtxPopup.cpp b/src/view/gallery-view/SourceCtxPopup.cpp
index 35e1c5b..2b6e92f 100644 (file)
--- a/src/view/gallery-view/SourceCtxPopup.cpp
+++ b/src/view/gallery-view/SourceCtxPopup.cpp
@@ -86,11 +86,13 @@ void CSourceCtxPopup::t_OnBtnClicked(Evas_Object *obj, void  *ev)
                        break;
        }
 
-       if (i == SOURCE_TEXT_SIZE || i == GetCb->cb(GetCb->cookie))
+       if (i == SOURCE_TEXT_SIZE)
                return;
 
-       SetCb->cb(SetCb->cookie, i);
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       if (i != GetCb->cb(GetCb->cookie)) {
+               SetCb->cb(SetCb->cookie, i);
+               CCtxPopup::t_OnBtnClicked(obj, ev);
+       }
 
        Destroy();
 }

diff --git a/src/view/photo-viewer/SettingCtxPopup.cpp b/src/view/photo-viewer/SettingCtxPopup.cpp
index 185850a..602a470 100644 (file)
--- a/src/view/photo-viewer/SettingCtxPopup.cpp
+++ b/src/view/photo-viewer/SettingCtxPopup.cpp
@@ -84,11 +84,13 @@ void CSettingCtxPopup::t_OnBtnClicked(Evas_Object *obj, void  *ev)
                        break;
        }
 
-       if (i == MAX_SPEED_BTNS || i == GetCb->cb(GetCb->cookie))
+       if (i == MAX_SPEED_BTNS)
                return;
 
-       SetCb->cb(SetCb->cookie, i);
-       CCtxPopup::t_OnBtnClicked(obj, ev);
+       if (i != GetCb->cb(GetCb->cookie)) {
+               SetCb->cb(SetCb->cookie, i);
+               CCtxPopup::t_OnBtnClicked(obj, ev);
+       }
 
        Destroy();
 }