Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c
Log Message:
change behaviour ready for some cool new features
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.c 28 Feb 2005 14:35:35 -0000 1.7
+++ e_mod_main.c 28 Feb 2005 21:44:51 -0000 1.8
@@ -987,6 +987,7 @@
double relx, rely, left, right, dummy;
Evas_List *items;
int bordersize, counter, done_min;
+ Engage_Icon *prev;
evas_object_geometry_get(eb->box_object, &x, &y, &w, &h);
if (w > 0) relx = (double)(mx - x) / (double)w;
@@ -1020,13 +1021,23 @@
icon = (Engage_Icon *) items->data;
distance = (double) (counter - mx) / (eb->engage->iconbordersize);
+ if (-0.5 < distance && distance < 0.5)
+ {
+ evas_object_raise(icon->icon_object);
+ evas_object_show(icon->event_object);
+ if (prev)
+ evas_object_hide(prev->event_object);
+ }
+ else
+ evas_object_hide(icon->event_object);
zoom_function(distance, &new_zoom, &relative_x, eb);
size = icon->scale * new_zoom * eb->engage->iconbordersize;
evas_object_image_fill_set(icon->icon_object, 0.0, 0.0, size, size);
evas_object_resize(icon->bg_object, size, size);
evas_object_move(icon->bg_object,
- mx + relative_x - 0.5 * size, y + h - size);
+ counter - 0.5 * size, y + h - size);
+ prev = icon;
items = items->next;
counter += eb->engage->iconbordersize;
@@ -1037,10 +1048,10 @@
}
}
- zoom_function((double) (x - mx) / (eb->engage->iconbordersize),
- &dummy, &left, eb);
- zoom_function((double) ((x + w) - mx) / (eb->engage->iconbordersize),
- &dummy, &right, eb);
+// zoom_function((double) (x - mx) / (eb->engage->iconbordersize),
+// &dummy, &left, eb);
+// zoom_function((double) ((x + w) - mx) / (eb->engage->iconbordersize),
+// &dummy, &right, eb);
/* FIXME move bar to x=mx + left, wide=right - left */
// evas_object_resize(eb->bar_object, right - left, h);
@@ -1369,7 +1380,7 @@
double range, f, x;
double ff, sqrt_ffxx, sqrt_ff_1;
- range = 2.5;
+ range = 1.0;
f = 1.5;
x = d / range;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
