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

[martinn svn gnome org]

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

Log:
Merged from trunk:

Bug 558215 â unit and zoom entries in Statusbar not visible

* app/display/gimpdisplayshell-callbacks.c
(gimp_display_shell_canvas_size_allocate): Don't try to be clever,
call gimp_display_shell_scaled() whenever the canvas size changes
so a newly created display shell gets updated properly.


Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/display/gimpdisplayshell-callbacks.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 29 22:38:03 2008
@@ -296,7 +296,6 @@
           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,6 +350,7 @@
         }
 
       gimp_display_shell_scroll_clamp_and_update (shell);
+      gimp_display_shell_scaled (shell);
 
       /* Reset */
       shell->size_allocate_from_configure_event = FALSE;