[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. f5b4e4555670cc3b4a24802eb44d7d47c379bee4
raster
raster at alioth.debian.org
Fri May 23 22:08:24 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit 1b751797e7728ee09e6ed9258b5f180d81823942
Author: raster <raster>
Date: Thu Apr 3 18:22:22 2008 +0000
oops fix logic. done.
diff --git a/src/lib/edje_callbacks.c b/src/lib/edje_callbacks.c
index 0c01223..35eb3cb 100644
--- a/src/lib/edje_callbacks.c
+++ b/src/lib/edje_callbacks.c
@@ -35,7 +35,7 @@ _edje_mouse_in_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
ed = data;
rp = evas_object_data_get(obj, "real_part");
if ((!rp) ||
- ((ev->event_flags) &&
+ ((ev->event_flags) &&
(!(rp->part->ignore_flags & ev->event_flags)))) return;
_edje_emit(ed, "mouse,in", rp->part->name);
return;
@@ -79,7 +79,7 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
_edje_ref(ed);
_edje_freeze(ed);
- if ((ev->event_flags) && (!ignored))
+ if ((!ev->event_flags) || (!ignored))
{
if (ev->flags & EVAS_BUTTON_TRIPLE_CLICK)
snprintf(buf, sizeof(buf), "mouse,down,%i,triple", ev->button);
@@ -191,7 +191,7 @@ _edje_mouse_up_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
_edje_ref(ed);
_edje_freeze(ed);
- if ((ev->event_flags) && (!ignored))
+ if ((!ev->event_flags) || (!ignored))
{
snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
_edje_emit(ed, buf, rp->part->name);
@@ -253,7 +253,7 @@ _edje_mouse_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
ignored = rp->part->ignore_flags & ev->event_flags;
_edje_ref(ed);
- if ((ev->event_flags) && (!ignored))
+ if ((!ev->event_flags) || (!ignored))
_edje_emit(ed, "mouse,move", rp->part->name);
if (rp->still_in)
--
Enlightenment DR17 graphical layout and animation library
More information about the Pkg-e-commits
mailing list