[gimp] Bug 760402 - Zoom in (with "Resize window on zoom") displays wrong...

[Michael Natterer <mitch src gnome org>]

commit 86cbc2f7a7fbfbcc248aab4acac5d59d68a70cdd
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jan 10 20:30:59 2016 +0100

    Bug 760402 - Zoom in (with "Resize window on zoom") displays wrong...
    
    ...several different zooms tiled together
    
    In gimp_display_shell_scale() don't shortcut things in the case where
    we resize the window, but call gimp_display_shell_scale_resize() like
    all other scaling functions do in the end.

 app/display/gimpdisplayshell-scale.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c
index d8b2108..338f11d 100644
--- a/app/display/gimpdisplayshell-scale.c
+++ b/app/display/gimpdisplayshell-scale.c
@@ -323,18 +323,12 @@ gimp_display_shell_scale (GimpDisplayShell *shell,
 
       if (resize_window)
         {
-          GimpImageWindow *window = gimp_display_shell_get_window (shell);
-
           /* If the window is resized on zoom, simply do the zoom and
            * get things rolling
            */
           gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, new_scale);
-          gimp_display_shell_scaled (shell);
 
-          if (window && gimp_image_window_get_active_shell (window) == shell)
-            {
-              gimp_image_window_shrink_wrap (window, FALSE);
-            }
+          gimp_display_shell_scale_resize (shell, TRUE, FALSE);
         }
       else
         {