Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
small tidy to fix non-zoom with new sub icons
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.c 3 Mar 2005 13:47:50 -0000 1.16
+++ e_mod_main.c 3 Mar 2005 15:51:02 -0000 1.17
@@ -444,6 +444,7 @@
eb->x = eb->y = eb->w = eb->h = -1;
eb->zoom = 1.0;
+ eb->zooming = 0;
eb->mouse_out = -1;
evas_event_freeze(eb->evas);
@@ -1486,30 +1487,38 @@
Engage_Bar *eb;
Evas_Coord x, y, w, h;
E_Gadman_Edge edge;
+ double multiplier;
ev = event_info;
eb = data;
- eb->zoom = 2.0;
+ eb->zoom = eb->conf->zoom_factor;
+ eb->zooming = 1;
evas_object_geometry_get(eb->box_object, &x, &y, &w, &h);
edge = e_gadman_client_edge_get(eb->gmc);
+
+ if (eb->conf->zoom)
+ multiplier = eb->conf->zoom_factor;
+ else
+ multiplier = 1;
+
if (edge == E_GADMAN_EDGE_LEFT)
{
- evas_object_resize(eb->event_object, w * (eb->conf->zoom_factor + 1),
h);
+ evas_object_resize(eb->event_object, w * (multiplier + 1), h);
}
else if (edge == E_GADMAN_EDGE_RIGHT)
{
- evas_object_resize(eb->event_object, w * (eb->conf->zoom_factor + 1),
h);
- evas_object_move(eb->event_object, x - w * eb->conf->zoom_factor, y);
+ evas_object_resize(eb->event_object, w * (multiplier + 1), h);
+ evas_object_move(eb->event_object, x - w * multiplier, y);
}
else if (edge == E_GADMAN_EDGE_TOP)
{
- evas_object_resize(eb->event_object, w , h * (eb->conf->zoom_factor +
1));
+ evas_object_resize(eb->event_object, w , h * (multiplier + 1));
}
else
{
- evas_object_resize(eb->event_object, w , h * (eb->conf->zoom_factor +
1));
- evas_object_move(eb->event_object, x, y - h * eb->conf->zoom_factor);
+ evas_object_resize(eb->event_object, w , h * (multiplier + 1));
+ evas_object_move(eb->event_object, x, y - h * multiplier);
}
// _engage_bar_motion_handle(eb, ev->canvas.x, ev->canvas.y);
}
@@ -1525,6 +1534,7 @@
eb = data;
eb->zoom = 1.0;
+ eb->zooming = 0;
evas_object_geometry_get(eb->box_object, &x, &y, &w, &h);
evas_object_move(eb->event_object, x, y);
evas_object_resize(eb->event_object, w, h);
@@ -1693,11 +1703,11 @@
sqrt_ffxx = sqrt(ff - x * x);
sqrt_ff_1 = sqrt(ff - 1.0);
- if (eb->zoom == 1.0)
+ if (!eb->zooming || !eb->conf->zoom)
{
*disp = d * eb->engage->iconbordersize;
*zoom = 1.0;
- return 0;
+ return eb->zooming;
}
if (d > -range && d < range)
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_main.h 3 Mar 2005 13:47:50 -0000 1.5
+++ e_mod_main.h 3 Mar 2005 15:51:02 -0000 1.6
@@ -57,6 +57,7 @@
Evas_Coord x, y, w, h;
double zoom;
+ int zooming;
E_Gadman_Client *gmc;
-------------------------------------------------------
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
