[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53249] trunk/blender/source/blender/ editors/interface/view2d_ops.c: Bug fix, own collection:

[Ton Roosendaal]

Revision: 53249
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53249
Author:   ton
Date:     2012-12-21 16:11:50 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
Bug fix, own collection:

User preference "Zoom Scale" didn't work correct for 2d views.
(was calculating center of region badly).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/view2d_ops.c

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-12-21 15:41:34 UTC (rev 53248)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2012-12-21 16:11:50 UTC (rev 53249)
@@ -1015,12 +1015,12 @@
 			
 			/* x-axis transform */
 			dist = BLI_rcti_size_x(&v2d->mask) / 2.0f;
-			dx = 1.0f - (fabsf(vzd->lastx - dist) + 2.0f) / (fabsf(event->x - dist) + 2.0f);
+			dx = 1.0f - (fabsf(vzd->lastx - vzd->ar->winrct.xmin - dist) + 2.0f) / (fabsf(event->mval[0] - dist) + 2.0f);
 			dx *= 0.5f * BLI_rctf_size_x(&v2d->cur);
 			
 			/* y-axis transform */
 			dist = BLI_rcti_size_y(&v2d->mask) / 2.0f;
-			dy = 1.0f - (fabsf(vzd->lasty - dist) + 2.0f) / (fabsf(event->y - dist) + 2.0f);
+			dy = 1.0f - (fabsf(vzd->lasty - vzd->ar->winrct.ymin- dist) + 2.0f) / (fabsf(event->mval[1] - dist) + 2.0f);
 			dy *= 0.5f * BLI_rctf_size_y(&v2d->cur);
 		}
 		else {
@@ -1034,18 +1034,7 @@
 			/* y-axis transform */
 			fac = 0.01f * (event->y - vzd->lasty);
 			dy = fac * BLI_rctf_size_y(&v2d->cur);
-#if 0
-			/* continuous zoom shouldn't move that fast... */
-			if (U.viewzoom == USER_ZOOM_CONT) { // XXX store this setting as RNA prop?
-				double time = PIL_check_seconds_timer();
-				float time_step = (float)(time - vzd->timer_lastdraw);
-
-				dx /= (0.1f / time_step);
-				dy /= (0.1f / time_step);
-				
-				vzd->timer_lastdraw = time;
-			}
-#endif
+			
 		}
 		
 		/* set transform amount, and add current deltas to stored total delta (for redo) */