callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename gimp_display_shell_scale_setup() to

Browse Source 
2008-08-10  Martin Nordholts  <martinn@svn.gnome.org>

	* 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.

svn path=/trunk/; revision=26484
This commit is contained in:
Martin Nordholts
2008-08-10 11:56:29 +00:00
committed by Martin Nordholts
parent c023ac02f9
commit 2eacb5cf58
7 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-08-10 Martin Nordholts <martinn@svn.gnome.org>
* 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 <martinn@svn.gnome.org> 2008-08-10 Martin Nordholts <martinn@svn.gnome.org>
* app/display/gimpdisplayshell-scale.c * app/display/gimpdisplayshell-scale.c

2
app/display/gimpdisplayshell-callbacks.c
View File

@ -303,7 +303,7 @@ gimp_display_shell_canvas_size_allocate (GtkWidget *widget,
shell->disp_height = allocation->height; shell->disp_height = allocation->height;
gimp_display_shell_scroll_clamp_offsets (shell); 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_scaled (shell);
} }
} }

4
app/display/gimpdisplayshell-handlers.c
View File

@ -422,7 +422,7 @@ gimp_display_shell_resolution_changed_handler (GimpImage *image,
if (shell->dot_for_dot) 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_scaled (shell);
} }
else else
@ -631,7 +631,7 @@ gimp_display_shell_monitor_res_notify_handler (GObject *config,
if (! shell->dot_for_dot) 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_scaled (shell);
gimp_display_shell_expose_full (shell); gimp_display_shell_expose_full (shell);

8
app/display/gimpdisplayshell-scale.c
View File

@ -79,14 +79,12 @@ static gdouble img2real (GimpDisplayShell *shell,
/* public functions */ /* public functions */
/** /**
* gimp_display_shell_scale_setup: * gimp_display_shell_update_scrollbars_and_rulers:
* @shell: the #GimpDisplayShell * @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 void
gimp_display_shell_scale_setup (GimpDisplayShell *shell) gimp_display_shell_update_scrollbars_and_rulers (GimpDisplayShell *shell)
{ {
GimpImage *image; GimpImage *image;
gint image_width; 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_shrink_wrap (shell, grow_only);
gimp_display_shell_scroll_clamp_offsets (shell); 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_scaled (shell);
gimp_display_shell_expose_full (shell); gimp_display_shell_expose_full (shell);

2
app/display/gimpdisplayshell-scale.h
View File

@ -20,7 +20,7 @@
#define __GIMP_DISPLAY_SHELL_SCALE_H__ #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_revert (GimpDisplayShell *shell);
gboolean gimp_display_shell_scale_can_revert (GimpDisplayShell *shell); gboolean gimp_display_shell_scale_can_revert (GimpDisplayShell *shell);

2
app/display/gimpdisplayshell-scroll.c
View File

@ -114,7 +114,7 @@ gimp_display_shell_scroll (GimpDisplayShell *shell,
gdk_window_process_updates (shell->canvas->window, FALSE); gdk_window_process_updates (shell->canvas->window, FALSE);
/* Update scrollbars and rulers */ /* Update scrollbars and rulers */
gimp_display_shell_scale_setup (shell); gimp_display_shell_update_scrollbars_and_rulers (shell);
gimp_display_shell_resume (shell); gimp_display_shell_resume (shell);

6
app/display/gimpdisplayshell.c
View File

@ -1247,7 +1247,7 @@ gimp_display_shell_reconnect (GimpDisplayShell *shell)
gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (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_scaled (shell);
gimp_display_shell_expose_full (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_scale (shell, GIMP_ZOOM_TO, 1.0);
gimp_display_shell_scroll_clamp_offsets (shell); 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_scaled (shell);
gimp_display_shell_unset_cursor (shell); gimp_display_shell_unset_cursor (shell);
@ -1475,7 +1475,7 @@ gimp_display_shell_set_unit (GimpDisplayShell *shell,
{ {
shell->unit = unit; shell->unit = unit;
gimp_display_shell_scale_setup (shell); gimp_display_shell_update_scrollbars_and_rulers (shell);
gimp_display_shell_scaled (shell); gimp_display_shell_scaled (shell);
g_object_notify (G_OBJECT (shell), "unit"); g_object_notify (G_OBJECT (shell), "unit");