Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src/module
Modified Files:
e_mod_main.c
Log Message:
Fix mouse in/out zoom issues
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_main.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- e_mod_main.c 8 Jan 2006 13:00:28 -0000 1.107
+++ e_mod_main.c 20 Jan 2006 14:19:17 -0000 1.108
@@ -2201,8 +2201,9 @@
multiplier = eb->conf->zoom_factor + ((eb->conf->zoom_factor)
* sqrt(2) / 2);
else
- multiplier = 1;
+ multiplier = 1.0;
+ evas_event_freeze(eb->evas);
if (edge == E_GADMAN_EDGE_LEFT)
{
evas_object_resize(eb->event_object, w * multiplier, h );
@@ -2210,7 +2211,7 @@
else if (edge == E_GADMAN_EDGE_RIGHT)
{
evas_object_resize(eb->event_object, w * multiplier, h );
- evas_object_move(eb->event_object, x - (w * (multiplier - 1)), y);
+ evas_object_move(eb->event_object, x - (w * (multiplier - 1)) + 1, y);
}
else if (edge == E_GADMAN_EDGE_TOP)
{
@@ -2219,8 +2220,9 @@
else
{
evas_object_resize(eb->event_object, w , h * multiplier);
- evas_object_move(eb->event_object, x, y - (h * (multiplier - 1)));
+ evas_object_move(eb->event_object, x, y - (h * (multiplier - 1)) + 1);
}
+ evas_event_thaw(eb->evas);
_engage_bar_motion_handle(eb, ev->canvas.x, ev->canvas.y);
}
@@ -2315,8 +2317,10 @@
{
eb->zoom = 1.0;
evas_object_geometry_get(eb->box_object, &bx, &by, &bw, &bh);
+ evas_event_freeze(eb->evas);
evas_object_move(eb->event_object, bx, by);
evas_object_resize(eb->event_object, bw, bh);
+ evas_event_thaw(eb->evas);
eb->state = ENGAGE_NORMAL;
_engage_bar_motion_handle(eb, x, y);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
