Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_private.h
Log Message:
fix dragables! eeek! :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- edje_calc.c 4 Nov 2003 06:15:19 -0000 1.22
+++ edje_calc.c 25 Dec 2003 23:57:18 -0000 1.23
@@ -235,6 +235,7 @@
if (x) *x = dx;
if (y) *y = dy;
+
return ret;
}
else
@@ -300,18 +301,18 @@
if (rel2_to_x)
params->w = desc->rel2.offset_x +
rel2_to_x->x + (desc->rel2.relative_x * rel2_to_x->w) -
- params->x;
+ params->x + 1;
else
- params->w = (double)desc->rel2.offset_x +
- (desc->rel2.relative_x * (double)ed->w) -
+ params->w = desc->rel2.offset_x +
+ (desc->rel2.relative_x * ed->w) -
params->x + 1;
if (rel2_to_y)
params->h = desc->rel2.offset_y +
rel2_to_y->y + (desc->rel2.relative_y * rel2_to_y->h) -
- params->y;
+ params->y + 1;
else
- params->h = (double)desc->rel2.offset_y +
- (desc->rel2.relative_y * (double)ed->h) -
+ params->h = desc->rel2.offset_y +
+ (desc->rel2.relative_y * ed->h) -
params->y + 1;
/* aspect */
@@ -504,7 +505,7 @@
if ((((minw > 0) && (v > minw)) || (minw <= 0)) &&
(((maxw >= 0) && (v < maxw)) || (maxw < 0))) params->w = v;
offset = (ep->drag.x * (confine_to->w - params->w)) +
- ep->drag.tmp.x + confine_to->x;
+ ep->drag.tmp.x;
if (ep->part->dragable.step_x > 0)
{
params->x = confine_to->x +
@@ -520,7 +521,7 @@
if ((((minh > 0) && (v > minh)) || (minh <= 0)) &&
(((maxh >= 0) && (v < maxh)) || (maxh < 0))) params->h = v;
offset = (ep->drag.y * (confine_to->h - params->h)) +
- ep->drag.tmp.y + confine_to->y;
+ ep->drag.tmp.y;
if (ep->part->dragable.step_y > 0)
{
params->y = confine_to->y +
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- edje_private.h 25 Nov 2003 07:22:18 -0000 1.51
+++ edje_private.h 25 Dec 2003 23:57:18 -0000 1.52
@@ -475,23 +475,23 @@
char *source;
void (*func) (void *data, Evas_Object *o, const char *emission, const char
*source);
void *data;
- int just_added : 1;
- int delete_me : 1;
+ char just_added : 1;
+ char delete_me : 1;
};
struct _Edje_Calc_Params
{
- double x, y, w, h;
+ int x, y, w, h;
struct {
- double x, y, w, h;
+ int x, y, w, h;
} req;
struct {
- double x, y, w, h;
+ int x, y, w, h;
} req_drag;
char visible : 1;
char smooth : 1;
struct {
- double x, y, w, h;
+ int x, y, w, h;
} fill;
struct {
unsigned char r, g, b, a;
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
