gimp r27367 - in branches/gimp-2-6: . app/display

[martinn svn gnome org]

Author: martinn
Date: Wed Oct 22 19:03:41 2008
New Revision: 27367
URL: http://svn.gnome.org/viewvc/gimp?rev=27367&view=rev

Log:
Bug 556804 â Zoom drop down doesn't update

* app/display/gimpdisplayshell-scale.c
* app/display/gimpdisplayshell-callbacks.c: Fix calls to
gimp_display_shell_scaled() when Resize window on zoom is enabled.


Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/display/gimpdisplayshell-callbacks.c
   branches/gimp-2-6/app/display/gimpdisplayshell-scale.c

Modified: branches/gimp-2-6/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- branches/gimp-2-6/app/display/gimpdisplayshell-callbacks.c	(original)
+++ branches/gimp-2-6/app/display/gimpdisplayshell-callbacks.c	Wed Oct 22 19:03:41 2008
@@ -296,6 +296,7 @@
           offset_y = UNSCALEX (shell, shell->offset_y);
 
           gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, scale);
+          gimp_display_shell_scaled (shell);
 
           shell->offset_x = SCALEX (shell, offset_x);
           shell->offset_y = SCALEY (shell, offset_y);
@@ -351,8 +352,6 @@
 
       gimp_display_shell_scroll_clamp_and_update (shell);
 
-      gimp_display_shell_scaled (shell);
-
       /* Reset */
       shell->size_allocate_from_configure_event = FALSE;
     }

Modified: branches/gimp-2-6/app/display/gimpdisplayshell-scale.c
==============================================================================
--- branches/gimp-2-6/app/display/gimpdisplayshell-scale.c	(original)
+++ branches/gimp-2-6/app/display/gimpdisplayshell-scale.c	Wed Oct 22 19:03:41 2008
@@ -367,6 +367,8 @@
            * get things rolling
            */
           gimp_zoom_model_zoom (shell->zoom, GIMP_ZOOM_TO, real_new_scale);
+          gimp_display_shell_scaled (shell);
+
           gimp_display_shell_shrink_wrap (shell, FALSE);
         }
       else