From: <enl...@li...> - 2001-08-21 23:30:17
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits/src Modified Files: ebits_main.c Log Message: fix fix.. ooops :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/ebits_main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ebits_main.c 2001/07/22 04:53:17 1.15 +++ ebits_main.c 2001/08/21 23:30:16 1.16 @@ -564,7 +564,8 @@ d = malloc(sizeof(struct _Ebits_Object_Description)); d = memset(d, 0, sizeof(struct _Ebits_Object_Description)); __bit_descriptions = evas_list_prepend(__bit_descriptions, d); - d->file = strdup(file); + d->file = malloc(strlen(file) + 1); + strcpy(d->file, file); d->references = 1; d->min.w = 0; @@ -830,7 +831,8 @@ state->b = 255; state->a = 255; - bit->normal.image = strdup(file); + bit->normal.image = malloc(strlen(file) + 1); + strcpy(bit->normal.image, file); state->object = evas_add_image_from_file(o->state.evas, _ebits_get_file(state->description, state->state)); evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_DOWN, _ebits_handle_mouse_down, state); evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_UP, _ebits_handle_mouse_up, state); @@ -883,13 +885,15 @@ while (__ebits_cache_zero > __ebits_cache_size) { Evas_List l; - Ebits_Object_Description d; + Ebits_Object_Description d, del; + del = NULL; for (l = __bit_descriptions; l; l = l->next) { d = l->data; - if (d->references != 0) d = NULL; + if (d->references == 0) del = d; } + d = del; if (d) { __ebits_cache_zero--; |
From: <enl...@li...> - 2001-09-06 13:18:57
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits/src Modified Files: Ebits.h Ebits_private.h ebits_main.c Log Message: sorry smugg... i had to do this.. it was too ambiguous if the name passed in was the name or class. i had to change the calls to be explicit... :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/Ebits.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Ebits.h 2001/07/20 09:10:04 1.7 +++ Ebits.h 2001/09/06 13:18:49 1.8 @@ -33,28 +33,30 @@ void ebits_get_min_size(Ebits_Object o, int *w, int *h); void ebits_get_max_size(Ebits_Object o, int *w, int *h); void ebits_get_size_step(Ebits_Object o, int *x, int *y); -void ebits_get_bit_geometry(Ebits_Object o, char *c, - double *x, double *y, double *w, double *h); -void ebits_set_bit_callback(Ebits_Object o, char *c, - Evas_Callback_Type type, - void (*func) (void *_data, Ebits_Object _o, - char *_c, int _b, int _x, int _y, - int _ox, int _oy, int _ow, int _oh), - void *data); void ebits_set_color_class(Ebits_Object o, char *cc, int r, int g, int b, int a); -void ebits_set_bit_replace(Ebits_Object o, char *c, - void (*func_show) (void *_data), - void (*func_hide) (void *_data), - void (*func_move) (void *_data, double x, double y), - void (*func_resize) (void *_data, double w, double h), - void (*func_raise) (void *_data), - void (*func_lower) (void *_data), - void (*func_set_layer) (void *_data, int l), - void (*func_set_clip) (void *_data, Evas_Object clip), - void (*func_set_color_class) (void *_data, char *cc, int r, int g, int b, int a), - void *data); -void ebits_set_bit_state(Ebits_Object o, char *c, char *state); +void ebits_set_classed_bit_callback(Ebits_Object o, char *c, + Evas_Callback_Type type, + void (*func) (void *_data, Ebits_Object _o, + char *_c, int _b, int _x, int _y, + int _ox, int _oy, int _ow, int _oh), + void *data); +void ebits_get_named_bit_geometry(Ebits_Object o, char *c, + double *x, double *y, double *w, double *h); +void ebits_set_named_bit_replace(Ebits_Object o, char *c, + void (*func_show) (void *_data), + void (*func_hide) (void *_data), + void (*func_move) (void *_data, double x, double y), + void (*func_resize) (void *_data, double w, double h), + void (*func_raise) (void *_data), + void (*func_lower) (void *_data), + void (*func_set_layer) (void *_data, int l), + void (*func_set_clip) (void *_data, Evas_Object clip), + void (*func_set_color_class) (void *_data, char *cc, int r, int g, int b, int a), + void (*func_get_min_size) (void *_data, double *w, double *h), + void (*func_get_max_size) (void *_data, double *w, double *h), + void *data); +void ebits_set_named_bit_state(Ebits_Object o, char *c, char *state); #ifdef __cplusplus } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/Ebits_private.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Ebits_private.h 2001/07/20 09:10:04 1.7 +++ Ebits_private.h 2001/09/06 13:18:49 1.8 @@ -109,6 +109,8 @@ void (*func_lower) (void *_data); void (*func_set_layer) (void *_data, int l); void (*func_set_clip) (void *_data, Evas_Object clip); + void (*func_get_min_size) (void *_data, double *w, double *h); + void (*func_get_max_size) (void *_data, double *w, double *h); void (*func_set_color_class) (void *_data, char *cc, int r, int g, int b, int a); #ifdef EDITOR =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/ebits_main.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ebits_main.c 2001/08/21 23:30:16 1.16 +++ ebits_main.c 2001/09/06 13:18:49 1.17 @@ -157,6 +157,7 @@ int x1, y1, x2, y2; int rx, ry, rw, rh; int want_w, want_h; + int minw, minh, maxw, maxh; if ((state->calculated) || (state->calc_pending)) return; @@ -251,18 +252,38 @@ state->w = ww; } } - if (state->w < state->description->min.w) - state->w = state->description->min.w; - if (state->h < state->description->min.h) - state->h = state->description->min.h; + minw = state->description->min.w; + minh = state->description->min.h; + maxw = state->description->max.w; + maxh = state->description->max.h; + if (state->func_get_min_size) + { + double mw, mh; + + state->func_get_min_size(state->func_data, &mw, &mh); + minw = mw; + minh = mh; + } + if (state->func_get_max_size) + { + double mw, mh; + + state->func_get_max_size(state->func_data, &mw, &mh); + maxw = mw; + maxh = mh; + } + if (state->w < minw) + state->w = minw; + if (state->h < minh) + state->h = minh; if (state->description->max.w == 0) { /* if the bit has some other pre-defined size */ } else { - if (state->w > state->description->max.w) - state->w = state->description->max.w; + if (state->w > maxw) + state->w = maxw; state->x -= (state->w - want_w) * state->description->align.w; } if (state->description->max.h == 0) @@ -271,8 +292,8 @@ } else { - if (state->h > state->description->max.h) - state->h = state->description->max.h; + if (state->h > maxh) + state->h = maxh; state->y -= (state->h - want_h) * state->description->align.h; } state->calculated = 1; @@ -1297,7 +1318,7 @@ if (y) *y = o->description->step.y; } -void ebits_get_bit_geometry(Ebits_Object o, char *c, double *x, double *y, double *w, double *h) +void ebits_get_named_bit_geometry(Ebits_Object o, char *c, double *x, double *y, double *w, double *h) { Ebits_Object_Bit_State state; @@ -1318,7 +1339,7 @@ } } -void ebits_set_bit_callback(Ebits_Object o, char *c, Evas_Callback_Type type, void (*func) (void *_data, Ebits_Object _o, char *_c, int _b, int _x, int _y, int _ox, int _oy, int _ow, int _oh), void *data) +void ebits_set_classed_bit_callback(Ebits_Object o, char *c, Evas_Callback_Type type, void (*func) (void *_data, Ebits_Object _o, char *_c, int _b, int _x, int _y, int _ox, int _oy, int _ow, int _oh), void *data) { Ebits_Object_Bit_State state; Evas_List l; @@ -1578,17 +1599,19 @@ } #endif -void ebits_set_bit_replace(Ebits_Object o, char *c, - void (*func_show) (void *_data), - void (*func_hide) (void *_data), - void (*func_move) (void *_data, double x, double y), - void (*func_resize) (void *_data, double w, double h), - void (*func_raise) (void *_data), - void (*func_lower) (void *_data), - void (*func_set_layer) (void *_data, int l), - void (*func_set_clip) (void *_data, Evas_Object clip), - void (*func_set_color_class) (void *_data, char *cc, int r, int g, int b, int a), - void *data) +void ebits_set_named_bit_replace(Ebits_Object o, char *c, + void (*func_show) (void *_data), + void (*func_hide) (void *_data), + void (*func_move) (void *_data, double x, double y), + void (*func_resize) (void *_data, double w, double h), + void (*func_raise) (void *_data), + void (*func_lower) (void *_data), + void (*func_set_layer) (void *_data, int l), + void (*func_set_clip) (void *_data, Evas_Object clip), + void (*func_set_color_class) (void *_data, char *cc, int r, int g, int b, int a), + void (*func_get_min_size) (void *_data, double *w, double *h), + void (*func_get_max_size) (void *_data, double *w, double *h), + void *data) { Evas_List l; @@ -1610,6 +1633,8 @@ state->func_lower = func_lower; state->func_set_layer = func_set_layer; state->func_set_clip = func_set_clip; + state->func_get_min_size = func_get_min_size; + state->func_get_max_size = func_get_max_size; state->func_set_color_class = func_set_color_class; if (state->func_set_clip) { @@ -1621,7 +1646,7 @@ } void -ebits_set_bit_state(Ebits_Object o, char *c, char *state) +ebits_set_named_bit_state(Ebits_Object o, char *c, char *state) { Evas_List l; |
From: <enl...@li...> - 2001-09-07 09:02:06
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits/src Modified Files: Ebits.h Ebits_private.h ebits_main.c Log Message: and a routine to tell you what the REAL minimum size is (the minimum size set coudl be different from the real one that is the smallest size at which that bit formats "correctly" - any smaller and things format incorrectly. the normal minimum siz eis always enforced. this one is not enforced). =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/Ebits.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Ebits.h 2001/09/06 13:18:49 1.8 +++ Ebits.h 2001/09/07 09:02:04 1.9 @@ -32,6 +32,7 @@ void ebits_get_insets(Ebits_Object o, int *l, int *r, int *t, int *b); void ebits_get_min_size(Ebits_Object o, int *w, int *h); void ebits_get_max_size(Ebits_Object o, int *w, int *h); +void ebits_get_real_min_size(Ebits_Object o, int *w, int *h); void ebits_get_size_step(Ebits_Object o, int *x, int *y); void ebits_set_color_class(Ebits_Object o, char *cc, int r, int g, int b, int a); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/Ebits_private.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Ebits_private.h 2001/09/06 13:18:49 1.8 +++ Ebits_private.h 2001/09/07 09:02:04 1.9 @@ -34,6 +34,11 @@ int l, r, t, b; } padding, inset; Evas_List bits; + struct { + int caculated; + int w; + int h; + } real_min_size; }; struct _Ebits_Object_Bit_Description @@ -96,6 +101,7 @@ int mouse_in; int state; int syncing; + int want_w, want_h; Evas_List callbacks; /* callbacks for when you embed an object in a bit */ =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/ebits_main.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ebits_main.c 2001/09/06 13:18:49 1.17 +++ ebits_main.c 2001/09/07 09:02:04 1.18 @@ -226,10 +226,10 @@ state->x = x1; state->y = y1; + + state->want_w = want_w = state->w = x2 - x1 + 1; + state->want_h = want_h = state->h = y2 - y1 + 1; - want_w = state->w = x2 - x1 + 1; - want_h = state->h = y2 - y1 + 1; - state->w = (state->w / state->description->step.x) * state->description->step.x; state->h = (state->h / state->description->step.y) * state->description->step.y; @@ -947,6 +947,64 @@ } } +static void +_ebits_calculate_min_size(Ebits_Object o) +{ + int pw, ph; + Evas_List l; + Ebits_Object_Bit_State state; + int maxw, maxh, mw, mh; + + if (o->description->real_min_size.caculated) return; + pw = o->state.w; + ph = o->state.h; + mw = maxw = 0; + mh = maxh = 0; + + do + { + mw += maxw; + mh += maxh; + o->state.w = mw; + o->state.h = mh; + + for (l = o->bits; l; l = l->next) + { + state = l->data; + state->calculated = 0; + } + for (l = o->bits; l; l = l->next) + { + int w, h; + + state = l->data; + _ebits_calculate(state); + w = state->w - state->want_w; + h = state->h - state->want_h; + if ((w > 0) && (w > maxw)) maxw = w; + if ((h > 0) && (h > maxh)) maxh = h; + } + } + while ((maxw != mw) || (maxh != mh)); + + o->state.w = pw; + o->state.h = ph; + for (l = o->bits; l; l = l->next) + { + state = l->data; + state->calculated = 0; + } + for (l = o->bits; l; l = l->next) + { + state = l->data; + _ebits_calculate(state); + } + + o->description->real_min_size.w = maxw; + o->description->real_min_size.h = maxh; + o->description->real_min_size.caculated = 1; +} + void ebits_set_cache(int count) { @@ -1310,6 +1368,13 @@ { if (w) *w = o->description->max.w; if (h) *h = o->description->max.h; +} + +void ebits_get_real_min_size(Ebits_Object o, int *w, int *h) +{ + _ebits_calculate_min_size(o); + if (w) *w = o->description->real_min_size.w; + if (h) *h = o->description->real_min_size.h; } void ebits_get_size_step(Ebits_Object o, int *x, int *y) |
From: <enl...@li...> - 2001-09-07 09:03:47
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits/src Modified Files: ebits_main.c Log Message: and dont cache it... we need to not cache it.. :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/ebits_main.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ebits_main.c 2001/09/07 09:02:04 1.18 +++ ebits_main.c 2001/09/07 09:03:47 1.19 @@ -24,6 +24,7 @@ static void _ebits_evaluate_fill(Ebits_Object_Bit_State state); static void _ebits_calculate(Ebits_Object_Bit_State state); static void _ebits_object_calculate(Ebits_Object o); +static void _ebits_calculate_min_size(Ebits_Object o); #define EBITS_FILE_REDIRECT "%s:/images/%s" /* #define LENIENT 1 */ @@ -955,7 +956,6 @@ Ebits_Object_Bit_State state; int maxw, maxh, mw, mh; - if (o->description->real_min_size.caculated) return; pw = o->state.w; ph = o->state.h; mw = maxw = 0; |
From: <enl...@li...> - 2001-09-24 21:13:57
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits/src Modified Files: Ebits_private.h ebits_main.c Log Message: working working working.... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/Ebits_private.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Ebits_private.h 2001/09/07 09:02:04 1.9 +++ Ebits_private.h 2001/09/24 21:13:56 1.10 @@ -75,10 +75,11 @@ struct _Ebits_Object_State { - double x, y, w, h; - int layer; - int visible; - Evas evas; + double x, y, w, h; + int layer; + int visible; + Evas_Object clip; + Evas evas; }; struct _Ebits_Callback =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/ebits_main.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ebits_main.c 2001/09/07 09:03:47 1.19 +++ ebits_main.c 2001/09/24 21:13:56 1.20 @@ -1305,13 +1305,15 @@ { Evas_List l; - for (l = o->bits; l->next; l = l->next); - for (; l; l = l->prev) + o->state.clip = clip; + for (l = o->bits; l; l = l->next) { Ebits_Object_Bit_State state; state = l->data; evas_set_clip(state->o->state.evas, state->object, clip); + if (state->func_set_clip) + state->func_set_clip(state->func_data, clip); } } @@ -1319,13 +1321,15 @@ { Evas_List l; - for (l = o->bits; l->next; l = l->next); - for (; l; l = l->prev) + o->state.clip = NULL; + for (l = o->bits; l; l = l->next) { Ebits_Object_Bit_State state; state = l->data; evas_unset_clip(state->o->state.evas, state->object); + if (state->func_set_clip) + state->func_set_clip(state->func_data, NULL); } } @@ -1689,6 +1693,8 @@ state = l->data; if (!strcmp(state->description->name, c)) { + double px, py, pw, ph; + state->func_data = data; state->func_show = func_show; state->func_hide = func_hide; @@ -1706,6 +1712,23 @@ state->func_set_clip(state->func_data, state->object); evas_set_color(o->state.evas, state->object, 255, 255, 255, 255); } + if ((o->state.visible) && (func_show)) func_show(data); + else if ((!o->state.visible) && (func_hide)) func_hide(data); + if ((state->description->color_class) && + (func_set_color_class)) + func_set_color_class(data, + state->description->color_class, + state->r, + state->g, + state->b, + state->a); + if (func_set_layer) + func_set_layer(data, o->state.layer); + if (func_set_clip) + func_set_clip(data, o->state.clip); + _ebits_object_calculate(o); + ebits_raise(o); + return; } } } |
From: <enl...@li...> - 2001-09-24 21:14:27
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits Modified Files: configure.ac Log Message: working working working.... =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.ac 2001/08/28 07:16:29 1.1 +++ configure.ac 2001/09/24 21:13:56 1.2 @@ -1,5 +1,4 @@ -AC_INIT -AC_CONFIG_SRCDIR([src/Ebits.h]) +AC_INIT(src/Ebits.h) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(ebits, 0.0.1) AC_C_BIGENDIAN @@ -25,10 +24,8 @@ AC_SUBST(edb_cflags) AC_SUBST(edb_libs) -AC_CONFIG_FILES([ +AC_OUTPUT([ Makefile src/Makefile ebits-config doc/Makefile debian/Makefile -]) -AC_CONFIG_COMMANDS([default],[[ +], [ chmod +x ebits-config -]],[[]]) -AC_OUTPUT +]) |
From: <enl...@li...> - 2001-10-20 06:20:51
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits/src Modified Files: ebits_main.c Log Message: if the bit is decoration... dont even accept events. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/ebits_main.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ebits_main.c 2001/10/13 19:05:20 1.21 +++ ebits_main.c 2001/10/20 06:20:50 1.22 @@ -876,11 +876,13 @@ bit->normal.image = malloc(strlen(file) + 1); strcpy(bit->normal.image, file); state->object = evas_add_image_from_file(o->state.evas, _ebits_get_file(state->description, state->state)); - evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_DOWN, _ebits_handle_mouse_down, state); - evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_UP, _ebits_handle_mouse_up, state); - evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_MOVE, _ebits_handle_mouse_move, state); - evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_IN, _ebits_handle_mouse_in, state); - evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_OUT, _ebits_handle_mouse_out, state); + { + evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_DOWN, _ebits_handle_mouse_down, state); + evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_UP, _ebits_handle_mouse_up, state); + evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_MOVE, _ebits_handle_mouse_move, state); + evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_IN, _ebits_handle_mouse_in, state); + evas_callback_add(o->state.evas, state->object, CALLBACK_MOUSE_OUT, _ebits_handle_mouse_out, state); + } if ((o->state.evas) && (state->object)) evas_set_color(o->state.evas, state->object, state->r, state->g, state->b, state->a); @@ -1199,11 +1201,17 @@ (!strcmp(state->description->normal.image, "-"))) { state->object = evas_add_rectangle(o->state.evas); + if ((state->description->class) && + (!strcmp(state->description->class, "Decoration"))) + evas_set_pass_events(o->state.evas, state->object, 1); evas_set_color(o->state.evas, state->object, 255, 255, 255, 0); } else { state->object = evas_add_image_from_file(o->state.evas, buf); + if ((state->description->class) && + (!strcmp(state->description->class, "Decoration"))) + evas_set_pass_events(o->state.evas, state->object, 1); } if ((state->o->state.evas) && (state->object)) evas_set_color(state->o->state.evas, state->object, |
From: <enl...@li...> - 2001-10-28 01:38:59
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits Modified Files: configure.in Log Message: er. yeah. :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in 2001/02/14 19:57:57 1.2 +++ configure.in 2001/10/28 01:38:29 1.3 @@ -1,6 +1,6 @@ AC_INIT(src/Ebits.h) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(ebits, 0.0.1) +AM_INIT_AUTOMAKE(ebits, 0.0.2) AC_C_BIGENDIAN AC_PROG_CC AM_PROG_CC_STDC |
From: <enl...@li...> - 2001-10-28 01:38:59
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ebits Dir : e17/libs/ebits/src Modified Files: Makefile.am ebits_main.c Log Message: er. yeah. :) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 2001/07/23 07:51:29 1.3 +++ Makefile.am 2001/10/28 01:38:29 1.4 @@ -31,4 +31,4 @@ libebits_la_LIBADD = $(LIBS_ALL) libebits_la_DEPENDENCIES = $(top_builddir)/config.h -libebits_la_LDFLAGS = -version-info 0:1:0 +libebits_la_LDFLAGS = -version-info 0:2:0 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ebits/src/ebits_main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ebits_main.c 2001/10/20 06:20:50 1.22 +++ ebits_main.c 2001/10/28 01:38:29 1.23 @@ -1324,6 +1324,9 @@ Ebits_Object_Bit_State state; state = l->data; + if (state->func_move) + state->func_move(state->func_data, + o->state.x + state->x, o->state.y + state->y); evas_move(state->o->state.evas, state->object, o->state.x + state->x, o->state.y + state->y); } |