[E-devel] [Patch][elm_map] Mouse wheel bug fix

2011-12-21 Thread Bluezery
Hi,

There is mouse wheel bug. Actually I have made it in previous patch :p

When using mouse wheel, tile size was changed between 0.5 ~ 2.0 before
zoom level is changed.
But actually it should be changed between 1.0 ~ 2.0. I have fixed it.
If tile size is below 1.0,  it does zoom-out.  And if tile size is
above 2.0, it does zoom-in.
Please review this bug patch.

-- 
BRs,
Kim.
Index: src/lib/elm_map.c
===
--- src/lib/elm_map.c	(리비전 66444)
+++ src/lib/elm_map.c	(작업 사본)
@@ -1643,6 +1643,7 @@ _mouse_wheel_cb(void *data, Evas *e __UN
 
if (!wd-paused)
  {
+int zoom_diff = 0;
 Evas_Event_Mouse_Wheel *ev = (Evas_Event_Mouse_Wheel*) event_info;
 Evas_Coord x, y, w, h;
 
@@ -1652,23 +1653,33 @@ _mouse_wheel_cb(void *data, Evas *e __UN
 wd-calc_job = ecore_job_add(_calc_job, wd);
 
 wd-wheel_diff -= ev-z;
-wd-pinch.level = pow(2.0, (double)wd-wheel_diff/10);
+wd-pinch.level = wd-pinch.diff * pow(2.0, (double)wd-wheel_diff/10);
 wd-pinch.cx = x + ((double)w * 0.5);
 wd-pinch.cy = y + ((double)h * 0.5);
 
-if (wd-wheel_diff = 10 || wd-wheel_diff = -10)
+if (wd-pinch.level  2.0 || wd-pinch.level  1.0)
   {
-
+ wd-wheel_diff = 0;
+ if (wd-pinch.level  2.0)
+   {
+  zoom_diff = 1;
+  wd-pinch.diff = 1.0;
+  wd-pinch.level = 1.0;
+   }
+ else if (wd-pinch.level  1.0)
+   {
+  zoom_diff = -1;
+  wd-pinch.diff = 2.0;
+  wd-pinch.level = 2.0;
+   }
 
  Elm_Map_Zoom_Mode temp;
  temp = wd-mode;
  wd-mode = ELM_MAP_ZOOM_MODE_MANUAL;
  wd-paused = EINA_TRUE;
- elm_map_zoom_set(data, wd-zoom + (wd-wheel_diff/10));
+ elm_map_zoom_set(data, wd-zoom + zoom_diff);
  wd-paused = EINA_FALSE;
  wd-mode = temp;
- wd-pinch.level = 1.0;
-	 wd-wheel_diff = 0;
   }
 else
   {
--
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create 
new or port existing apps to sell to consumers worldwide. Explore the 
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] [Patch][elm_map] Mouse wheel bug fix

2011-12-21 Thread The Rasterman
On Thu, 22 Dec 2011 12:54:57 +0900 Bluezery ohpo...@gmail.com said:

 Hi,
 
 There is mouse wheel bug. Actually I have made it in previous patch :p
 
 When using mouse wheel, tile size was changed between 0.5 ~ 2.0 before
 zoom level is changed.
 But actually it should be changed between 1.0 ~ 2.0. I have fixed it.
 If tile size is below 1.0,  it does zoom-out.  And if tile size is
 above 2.0, it does zoom-in.
 Please review this bug patch.

in svn :)

-- 
- Codito, ergo sum - I code, therefore I am --
The Rasterman (Carsten Haitzler)ras...@rasterman.com


--
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create 
new or port existing apps to sell to consumers worldwide. Explore the 
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel