diff --git a/ChangeLog b/ChangeLog index 745585729e..6dba140a89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-08-10 Martin Nordholts + + * app/display/gimpdisplayshell-scale.[ch]: + Rename gimp_display_shell_scale_setup() to + gimp_display_shell_update_scrollbars_and_rulers(), because that's + exactly what that function does. + + * app/display/gimpdisplayshell.c + * app/display/gimpdisplayshell-scroll.c + * app/display/gimpdisplayshell-handlers.c + * app/display/gimpdisplayshell-callbacks.c: Adapt to new name. + 2008-08-10 Martin Nordholts * app/display/gimpdisplayshell-scale.c diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index b5afc150c6..b67fb611f3 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -303,7 +303,7 @@ gimp_display_shell_canvas_size_allocate (GtkWidget *widget, shell->disp_height = allocation->height; gimp_display_shell_scroll_clamp_offsets (shell); - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_scaled (shell); } } diff --git a/app/display/gimpdisplayshell-handlers.c b/app/display/gimpdisplayshell-handlers.c index b5e22e80e3..31b633a0f2 100644 --- a/app/display/gimpdisplayshell-handlers.c +++ b/app/display/gimpdisplayshell-handlers.c @@ -422,7 +422,7 @@ gimp_display_shell_resolution_changed_handler (GimpImage *image, if (shell->dot_for_dot) { - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_scaled (shell); } else @@ -631,7 +631,7 @@ gimp_display_shell_monitor_res_notify_handler (GObject *config, if (! shell->dot_for_dot) { - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_scaled (shell); gimp_display_shell_expose_full (shell); diff --git a/app/display/gimpdisplayshell-scale.c b/app/display/gimpdisplayshell-scale.c index 7619c76927..42f90b6cf4 100644 --- a/app/display/gimpdisplayshell-scale.c +++ b/app/display/gimpdisplayshell-scale.c @@ -79,14 +79,12 @@ static gdouble img2real (GimpDisplayShell *shell, /* public functions */ /** - * gimp_display_shell_scale_setup: + * gimp_display_shell_update_scrollbars_and_rulers: * @shell: the #GimpDisplayShell * - * Prepares the display for drawing the image at current scale and offset. - * This preparation involves, for example, setting up scrollbars and rulers. **/ void -gimp_display_shell_scale_setup (GimpDisplayShell *shell) +gimp_display_shell_update_scrollbars_and_rulers (GimpDisplayShell *shell) { GimpImage *image; gint image_width; @@ -585,7 +583,7 @@ gimp_display_shell_scale_resize (GimpDisplayShell *shell, gimp_display_shell_shrink_wrap (shell, grow_only); gimp_display_shell_scroll_clamp_offsets (shell); - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_scaled (shell); gimp_display_shell_expose_full (shell); diff --git a/app/display/gimpdisplayshell-scale.h b/app/display/gimpdisplayshell-scale.h index 8509b2db2d..77f48b7bb9 100644 --- a/app/display/gimpdisplayshell-scale.h +++ b/app/display/gimpdisplayshell-scale.h @@ -20,41 +20,41 @@ #define __GIMP_DISPLAY_SHELL_SCALE_H__ -void gimp_display_shell_scale_setup (GimpDisplayShell *shell); +void gimp_display_shell_update_scrollbars_and_rulers (GimpDisplayShell *shell); -gboolean gimp_display_shell_scale_revert (GimpDisplayShell *shell); -gboolean gimp_display_shell_scale_can_revert (GimpDisplayShell *shell); +gboolean gimp_display_shell_scale_revert (GimpDisplayShell *shell); +gboolean gimp_display_shell_scale_can_revert (GimpDisplayShell *shell); -void gimp_display_shell_scale_set_dot_for_dot (GimpDisplayShell *shell, - gboolean dot_for_dot); +void gimp_display_shell_scale_set_dot_for_dot (GimpDisplayShell *shell, + gboolean dot_for_dot); -void gimp_display_shell_scale (GimpDisplayShell *shell, - GimpZoomType zoom_type, - gdouble scale); -void gimp_display_shell_scale_to (GimpDisplayShell *shell, - GimpZoomType zoom_type, - gdouble scale, - gdouble x, - gdouble y); -void gimp_display_shell_scale_fit_in (GimpDisplayShell *shell); -void gimp_display_shell_scale_fill (GimpDisplayShell *shell); -void gimp_display_shell_scale_by_values (GimpDisplayShell *shell, - gdouble scale, - gint offset_x, - gint offset_y, - gboolean resize_window); -void gimp_display_shell_scale_shrink_wrap (GimpDisplayShell *shell, - gboolean grow_only); +void gimp_display_shell_scale (GimpDisplayShell *shell, + GimpZoomType zoom_type, + gdouble scale); +void gimp_display_shell_scale_to (GimpDisplayShell *shell, + GimpZoomType zoom_type, + gdouble scale, + gdouble x, + gdouble y); +void gimp_display_shell_scale_fit_in (GimpDisplayShell *shell); +void gimp_display_shell_scale_fill (GimpDisplayShell *shell); +void gimp_display_shell_scale_by_values (GimpDisplayShell *shell, + gdouble scale, + gint offset_x, + gint offset_y, + gboolean resize_window); +void gimp_display_shell_scale_shrink_wrap (GimpDisplayShell *shell, + gboolean grow_only); -void gimp_display_shell_scale_resize (GimpDisplayShell *shell, - gboolean resize_window, - gboolean grow_only); -void gimp_display_shell_set_initial_scale (GimpDisplayShell *shell, - gdouble scale, - gint *display_width, - gint *display_height); +void gimp_display_shell_scale_resize (GimpDisplayShell *shell, + gboolean resize_window, + gboolean grow_only); +void gimp_display_shell_set_initial_scale (GimpDisplayShell *shell, + gdouble scale, + gint *display_width, + gint *display_height); -void gimp_display_shell_scale_dialog (GimpDisplayShell *shell); +void gimp_display_shell_scale_dialog (GimpDisplayShell *shell); #endif /* __GIMP_DISPLAY_SHELL_SCALE_H__ */ diff --git a/app/display/gimpdisplayshell-scroll.c b/app/display/gimpdisplayshell-scroll.c index eb5a95d168..ccdf69aba4 100644 --- a/app/display/gimpdisplayshell-scroll.c +++ b/app/display/gimpdisplayshell-scroll.c @@ -114,7 +114,7 @@ gimp_display_shell_scroll (GimpDisplayShell *shell, gdk_window_process_updates (shell->canvas->window, FALSE); /* Update scrollbars and rulers */ - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_resume (shell); diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 74c0c76001..3e93465552 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -1247,7 +1247,7 @@ gimp_display_shell_reconnect (GimpDisplayShell *shell) gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (shell)); - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_scaled (shell); gimp_display_shell_expose_full (shell); @@ -1300,7 +1300,7 @@ gimp_display_shell_empty (GimpDisplayShell *shell) gimp_display_shell_scale (shell, GIMP_ZOOM_TO, 1.0); gimp_display_shell_scroll_clamp_offsets (shell); - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_scaled (shell); gimp_display_shell_unset_cursor (shell); @@ -1475,7 +1475,7 @@ gimp_display_shell_set_unit (GimpDisplayShell *shell, { shell->unit = unit; - gimp_display_shell_scale_setup (shell); + gimp_display_shell_update_scrollbars_and_rulers (shell); gimp_display_shell_scaled (shell); g_object_notify (G_OBJECT (shell), "unit");