gimp r26805 - in trunk: . app/display

[martinn svn gnome org]

Author: martinn
Date: Thu Aug 28 19:35:14 2008
New Revision: 26805
URL: http://svn.gnome.org/viewvc/gimp?rev=26805&view=rev

Log:
2008-08-28  Martin Nordholts  <martinn svn gnome org>

	* app/display/gimpdisplayshell-scale.c
	(gimp_display_shell_scale_to): Canonically calculate scale to use
	for zoom-focus calculations so that it also works when not in Dot
	by dot-mode.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-scale.c

Modified: trunk/app/display/gimpdisplayshell-scale.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scale.c	(original)
+++ trunk/app/display/gimpdisplayshell-scale.c	Thu Aug 28 19:35:14 2008
@@ -751,6 +751,7 @@
                              gint              viewport_x,
                              gint              viewport_y)
 {
+  gdouble scale_x, scale_y;
   gdouble image_focus_x, image_focus_y;
   gint    target_offset_x, target_offset_y;
 
@@ -766,8 +767,10 @@
                                        &image_focus_y,
                                        FALSE);
 
-  target_offset_x = scale * image_focus_x - viewport_x;
-  target_offset_y = scale * image_focus_y - viewport_y;
+  gimp_display_shell_calculate_scale_x_and_y (shell, scale, &scale_x, &scale_y);
+
+  target_offset_x = scale_x * image_focus_x - viewport_x;
+  target_offset_y = scale_y * image_focus_y - viewport_y;
 
   /* Note that we never come here if we need to
    * resize_windows_on_zoom