edje_callbacks.c   edje_callbacks.c 
skipping to change at line 137 skipping to change at line 137
events->drag->down.y = ev->canvas.y; events->drag->down.y = ev->canvas.y;
events->drag->tmp.y = 0; events->drag->tmp.y = 0;
} }
if (!ignored) if (!ignored)
{ {
snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button); snprintf(buf, sizeof(buf), "mouse,down,%i", ev->button);
_edje_emit(ed, buf, events->part->name); _edje_emit(ed, buf, events->part->name);
} }
ed->dirty = 1; ed->dirty = 1;
ed->recalc_call = 1;
#ifdef EDJE_CALC_CACHE #ifdef EDJE_CALC_CACHE
rp->invalidate = 1; rp->invalidate = 1;
#endif #endif
} }
_edje_recalc_do(ed); _edje_recalc_do(ed);
/* /*
_edje_thaw(ed); _edje_thaw(ed);
_edje_unref(ed); _edje_unref(ed);
_edje_ref(ed); _edje_ref(ed);
_edje_freeze(ed); _edje_freeze(ed);
skipping to change at line 160 skipping to change at line 161
FLOAT_T dx = ZERO, dy = ZERO; FLOAT_T dx = ZERO, dy = ZERO;
_edje_part_dragable_calc(ed, rp, &dx, &dy); _edje_part_dragable_calc(ed, rp, &dx, &dy);
if ((dx != rp->drag->val.x) || (dy != rp->drag->val.y)) if ((dx != rp->drag->val.x) || (dy != rp->drag->val.y))
{ {
rp->drag->val.x = dx; rp->drag->val.x = dx;
rp->drag->val.y = dy; rp->drag->val.y = dy;
if (!ignored) if (!ignored)
_edje_emit(ed, "drag", rp->part->name); _edje_emit(ed, "drag", rp->part->name);
ed->recalc_call = 1;
ed->dirty = 1; ed->dirty = 1;
#ifdef EDJE_CALC_CACHE #ifdef EDJE_CALC_CACHE
rp->invalidate = 1; rp->invalidate = 1;
#endif #endif
rp->drag->need_reset = 1; rp->drag->need_reset = 1;
_edje_recalc_do(ed); _edje_recalc_do(ed);
} }
} }
} }
skipping to change at line 238 skipping to change at line 240
} }
if (rp->drag) if (rp->drag)
{ {
if (rp->drag->down.count > 0) if (rp->drag->down.count > 0)
{ {
rp->drag->down.count--; rp->drag->down.count--;
if (rp->drag->down.count == 0) if (rp->drag->down.count == 0)
{ {
rp->drag->need_reset = 1; rp->drag->need_reset = 1;
ed->recalc_call = 1;
ed->dirty = 1; ed->dirty = 1;
#ifdef EDJE_CALC_CACHE #ifdef EDJE_CALC_CACHE
rp->invalidate = 1; rp->invalidate = 1;
#endif #endif
if (!ignored) if (!ignored)
_edje_emit(ed, "drag,stop", rp->part->name); _edje_emit(ed, "drag,stop", rp->part->name);
} }
} }
} }
skipping to change at line 317 skipping to change at line 320
} }
_edje_freeze(ed); _edje_freeze(ed);
if (rp->drag) if (rp->drag)
{ {
if (rp->drag->down.count > 0) if (rp->drag->down.count > 0)
{ {
if (rp->part->dragable.x) if (rp->part->dragable.x)
rp->drag->tmp.x = ev->cur.canvas.x - rp->drag->down.x; rp->drag->tmp.x = ev->cur.canvas.x - rp->drag->down.x;
if (rp->part->dragable.y) if (rp->part->dragable.y)
rp->drag->tmp.y = ev->cur.canvas.y - rp->drag->down.y; rp->drag->tmp.y = ev->cur.canvas.y - rp->drag->down.y;
ed->recalc_call = 1;
ed->dirty = 1; ed->dirty = 1;
#ifdef EDJE_CALC_CACHE #ifdef EDJE_CALC_CACHE
rp->invalidate = 1; rp->invalidate = 1;
#endif #endif
} }
_edje_recalc_do(ed); _edje_recalc_do(ed);
if (rp->drag->down.count > 0) if (rp->drag->down.count > 0)
{ {
FLOAT_T dx, dy; FLOAT_T dx, dy;
_edje_part_dragable_calc(ed, rp, &dx, &dy); _edje_part_dragable_calc(ed, rp, &dx, &dy);
if ((dx != rp->drag->val.x) || (dy != rp->drag->val.y)) if ((dx != rp->drag->val.x) || (dy != rp->drag->val.y))
{ {
rp->drag->val.x = dx; rp->drag->val.x = dx;
rp->drag->val.y = dy; rp->drag->val.y = dy;
if (!ignored) if (!ignored)
_edje_emit(ed, "drag", rp->part->name); _edje_emit(ed, "drag", rp->part->name);
ed->recalc_call = 1;
ed->dirty = 1; ed->dirty = 1;
#ifdef EDJE_CALC_CACHE #ifdef EDJE_CALC_CACHE
rp->invalidate = 1; rp->invalidate = 1;
#endif #endif
_edje_recalc_do(ed); _edje_recalc_do(ed);
} }
} }
} }
_edje_unref(ed); _edje_unref(ed);
_edje_thaw(ed); _edje_thaw(ed);
 End of changes. 5 change blocks. 
0 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/