enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

elm_photo: Do not call clicked callback when drag and drop started.

This commit is contained in:
Daniel Juyung Seo 2013-10-18 20:33:47 +09:00
parent ac54bf0022
commit 2cc8f13972
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
legacy/elementary/src/lib/elm_photo.c
View File

@ -111,8 +111,11 @@ static void
_drag_done_cb(void *unused __UNUSED__,
Evas_Object *obj)
{
ELM_PHOTO_DATA_GET(obj, sd);
elm_object_scroll_freeze_pop(obj);
evas_object_smart_callback_call(obj, SIG_DRAG_END, NULL);
sd->drag_started = EINA_FALSE;
}
static void
@ -174,6 +177,7 @@ _long_press_cb(void *obj)
{
elm_object_scroll_freeze_push(obj);
evas_object_smart_callback_call(obj, SIG_DRAG_START, NULL);
sd->drag_started = EINA_TRUE;
}
}
@ -213,7 +217,8 @@ _mouse_up(void *data,
ELM_SAFE_FREE(sd->long_press_timer, ecore_timer_del);
evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
if (!sd->drag_started)
evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
}
static inline int

4
legacy/elementary/src/lib/elm_widget_photo.h
View File

@ -23,7 +23,6 @@ struct _Elm_Photo_Smart_Data
{
Evas_Object *icon;
int size;
Eina_Bool fill_inside;
Ecore_Timer *long_press_timer;
#ifdef HAVE_ELEMENTARY_ETHUMB
@ -36,6 +35,9 @@ struct _Elm_Photo_Smart_Data
} file, thumb;
} thumb;
#endif
Eina_Bool fill_inside: 1;
Eina_Bool drag_started: 1; /*<< set true when drag started */
};
/**