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

init drag step on load 

freeze/thaw imbalance! fix. :(


SVN revision: 9365
This commit is contained in:
Carsten Haitzler 2004-03-16 08:38:51 +00:00
parent 792e48fa4c
commit e069710f42
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/edje/src/lib/Edje_Edit.h
View File

@ -397,11 +397,11 @@ struct _Edje
Evas_List *pending_actions;
Evas_List *color_classes;
Evas_List *text_classes;
int freeze;
int references;
int block;
Evas_List *emissions;
int load_error;
int freeze;
};
struct _Edje_Real_Part

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

@ -179,9 +179,10 @@ _edje_mouse_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
}
_edje_ref(ed);
_edje_emit(ed, "mouse,move", rp->part->name);
ed->calc_only = 1;
/* FIXME: this FUCKS up badly!!!! */
/* ed->calc_only = 1; */
_edje_recalc(ed);
ed->calc_only = 0;
/* ed->calc_only = 0; */
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
if (rp->drag.down.count > 0)

2
legacy/edje/src/lib/edje_load.c
View File

@ -147,6 +147,8 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
evas_object_pass_events_set(rp->object, 1);
if (rp->part->clip_to_id < 0)
evas_object_clip_set(rp->object, ed->clipper);
rp->drag.step.x = ep->dragable.step_x;
rp->drag.step.y = ep->dragable.step_y;
}
for (l = ed->parts; l; l = l->next)
{

14
legacy/edje/src/lib/edje_program.c
View File

@ -275,13 +275,13 @@ _edje_program_run_iterate(Edje_Running_Program *runp, double tim)
if (pa->id >= 0)
{
pr = evas_list_nth(ed->collection->programs, pa->id);
if (pr) _edje_program_run(ed, pr, 0);
if (_edje_block_break(ed))
{
if (!ed->walking_actions) free(runp);
goto break_prog;
}
pr = evas_list_nth(ed->collection->programs, pa->id);
if (pr) _edje_program_run(ed, pr, 0);
if (_edje_block_break(ed))
{
if (!ed->walking_actions) free(runp);
goto break_prog;
}
}
}
_edje_thaw(ed);