Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje_Edit.h edje_callbacks.c edje_load.c edje_program.c
Log Message:
init drag step on load
freeze/thaw imbalance! fix. :(
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/Edje_Edit.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Edje_Edit.h 8 Mar 2004 02:43:48 -0000 1.2
+++ Edje_Edit.h 16 Mar 2004 08:38:51 -0000 1.3
@@ -397,11 +397,11 @@
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
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje_callbacks.c 19 Oct 2003 02:11:06 -0000 1.12
+++ edje_callbacks.c 16 Mar 2004 08:38:51 -0000 1.13
@@ -179,9 +179,10 @@
}
_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)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- edje_load.c 8 Mar 2004 02:43:48 -0000 1.36
+++ edje_load.c 16 Mar 2004 08:38:51 -0000 1.37
@@ -147,6 +147,8 @@
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)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_program.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- edje_program.c 8 Mar 2004 02:43:48 -0000 1.28
+++ edje_program.c 16 Mar 2004 08:38:51 -0000 1.29
@@ -275,13 +275,13 @@
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);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
