Fixed an issue that popup does not close

Change-Id: I626119bd7f2a862706e7a52cd4b6f0fb279069ee

diff --git a/src/moments/moments_control_view.c b/src/moments/moments_control_view.c
index d4c4f5a21adcb4e667213247948c732f37b3ae7d..9b8cc8fb4df93917c34a102dc478b77946853b18 100755 (executable)
--- a/src/moments/moments_control_view.c
+++ b/src/moments/moments_control_view.c
@@ -130,6 +130,8 @@ static void __control_button_move_cb(void *data, Evas *e, Evas_Object *obj, void
 
 static void __control_button_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
+       move_count++;
+
        elm_object_signal_emit(obj, "layout.pressed", "");
 }
 
@@ -137,7 +139,7 @@ static void __control_button_up_cb(void *data, Evas *e, Evas_Object *obj, void *
 {
        _D("%d", move_count);
 
-       if (move_count < 10) {
+       if (move_count >= 1 && move_count < 10) {
                control_info_t *btn_info = (control_info_t *)data;
                if (btn_info != NULL && btn_info->pressed != NULL) btn_info->pressed(NULL, NULL, NULL, NULL);
        }
@@ -238,6 +240,10 @@ control_info_t *moments_control_create_button(Evas_Object *base_layout, int butt
 void moments_control_destroy_button(control_info_t *button_info)
 {
        if (button_info->button_layout != NULL) {
+               evas_object_event_callback_del(button_info->button_layout, EVAS_CALLBACK_MOUSE_UP, __control_button_up_cb);
+               evas_object_event_callback_del(button_info->button_layout, EVAS_CALLBACK_MOUSE_DOWN, __control_button_down_cb);
+               evas_object_event_callback_del(button_info->button_layout, EVAS_CALLBACK_MOUSE_MOVE, __control_button_move_cb);
+
                Evas_Object *icon = elm_object_part_content_get(button_info->button_layout, CONTROLS_ICON);
                if (icon != NULL) {
                        evas_object_del(icon);