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.

svn path=/trunk/; revision=27366
This commit is contained in:
Martin Nordholts 2008-10-22 19:02:00 +00:00
parent e959bf084c
commit 2427cc5495
3 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2008-10-22 Martin Nordholts <martinn@svn.gnome.org>
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.
2008-10-22 Sven Neumann <sven@gimp.org>
Bug 524615 Print not to scale

View File

@ -296,6 +296,7 @@ gimp_display_shell_canvas_size_allocate (GtkWidget *widget,
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_canvas_size_allocate (GtkWidget *widget,
gimp_display_shell_scroll_clamp_and_update (shell);
gimp_display_shell_scaled (shell);
/* Reset */
shell->size_allocate_from_configure_event = FALSE;
}

View File

@ -368,6 +368,8 @@ gimp_display_shell_scale (GimpDisplayShell *shell,
* 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