dia r4098 - in trunk: . app

[hans svn gnome org]

Author: hans
Date: Sat Jul 26 10:10:05 2008
New Revision: 4098
URL: http://svn.gnome.org/viewvc/dia?rev=4098&view=rev

Log:
2008-07-26  Hans Breuer  <hans breuer org>

	* app/display.c(ddisplay_zoom) : reverted changes from bug #540210,
	it broke the other use cases, mainly zoom all (ctrl^e)
	


Modified:
   trunk/ChangeLog
   trunk/app/display.c

Modified: trunk/app/display.c
==============================================================================
--- trunk/app/display.c	(original)
+++ trunk/app/display.c	Sat Jul 26 10:10:05 2008
@@ -759,15 +759,11 @@
 {
   Rectangle *visible;
   real width, height;
-  real rx, ry;
 
   visible = &ddisp->visible;
 
   width = (visible->right - visible->left)/magnify;
   height = (visible->bottom - visible->top)/magnify;
-  /* calculate cursor position ratios */
-  rx = (point->x - visible->left) / (visible->right - visible->left);
-  ry = (point->y - visible->top) / (visible->bottom - visible->top);
 
   if ((ddisp->zoom_factor <= DDISPLAY_MIN_ZOOM) && (magnify<=1.0))
     return;
@@ -776,8 +772,7 @@
 
   ddisp->zoom_factor *= magnify;
 
-  /* set new origin based on the calculated ratios before zooming */
-  ddisplay_set_origo(ddisp, point->x-(width*rx),point->y-(height*ry));
+  ddisplay_set_origo(ddisp, point->x - width/2.0, point->y - height/2.0);
   
   ddisplay_update_scrollbars(ddisp);
   ddisplay_add_update_all(ddisp);