kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle double/triple click again 

SVN revision: 12397
This commit is contained in:
Carsten Haitzler 2004-12-07 13:31:15 +00:00
parent d229b9f061
commit 96c09fd010
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/edje/configure.in
View File

@ -131,6 +131,12 @@ AC_ARG_WITH(ecore-config, [ --with-ecore-config=ECORE_CONFIG use ecore-config
ecore_cflags=`$ECORE_CONFIG --cflags`
ecore_libs=`$ECORE_CONFIG --libs`
CP=$CFLAGS
CFLAGS=$ecore_cflags
AC_CHECK_HEADER(Ecore_X.h, AC_DEFINE(HAVE_ECORE_X, 1, [Ecore_X.h exists]))
AC_CHECK_HEADER(Ecore_Fb.h, AC_DEFINE(HAVE_ECORE_FB, 1, [Ecore_Fb.h exists]))
CFLAGS=$CP
AC_ARG_WITH(eet-config, [ --with-eet-config=EET_CONFIG use eet-config specified ],
[ EET_CONFIG=$withval;
echo "using "$EET_CONFIG" for eet-config"; ],

26
legacy/edje/src/lib/edje_callbacks.c
View File

@ -45,7 +45,7 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
ed = data;
rp = evas_object_data_get(obj, "real_part");
if (!rp) return;
#ifdef _ECORE_X_H
#ifdef HAVE_ECORE_X
if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_DOWN)
{
Ecore_X_Event_Mouse_Button_Down *evx;
@ -64,9 +64,31 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
}
else
#endif
#ifdef HAVE_ECORE_FB
if (ecore_event_current_type_get() == ECORE_FB_EVENT_MOUSE_BUTTON_DOWN)
{
Ecore_Fb_Event_Mouse_Button_Down *evfb;
evfb = ecore_event_current_event_get();
if (evfb)
{
if (evfb->triple_click)
snprintf(buf, sizeof(buf), "mouse,down,%i,triple", ev->button);
else if (evfb->double_click)
snprintf(buf, sizeof(buf), "mouse,down,%i,double", ev->button);
else
snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
}
else
snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
}
else
#endif
snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
_edje_ref(ed);
_edje_freeze(ed);
_edje_emit(ed, buf, rp->part->name);
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
if (rp->drag.down.count == 0)
@ -84,8 +106,6 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
rp->clicked_button = ev->button;
rp->still_in = 1;
}
_edje_freeze(ed);
_edje_emit(ed, buf, rp->part->name);
_edje_recalc(ed);
_edje_thaw(ed);
_edje_unref(ed);

5
legacy/edje/src/lib/edje_private.h
View File

@ -7,9 +7,12 @@
#include <Evas.h>
#include <Ecore.h>
#ifdef HAVE_ECORE_X_H
#ifdef HAVE_ECORE_X
#include <Ecore_X.h>
#endif
#ifdef HAVE_ECORE_FB
#include <Ecore_Fb.h>
#endif
#include <Eet.h>
#include <Embryo.h>