gimp r26484 - in trunk: . app/display
- From: martinn svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r26484 - in trunk: . app/display
- Date: Sun, 10 Aug 2008 11:56:29 +0000 (UTC)
Author: martinn
Date: Sun Aug 10 11:56:29 2008
New Revision: 26484
URL: http://svn.gnome.org/viewvc/gimp?rev=26484&view=rev
Log:
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.
Modified:
trunk/ChangeLog
trunk/app/display/gimpdisplayshell-callbacks.c
trunk/app/display/gimpdisplayshell-handlers.c
trunk/app/display/gimpdisplayshell-scale.c
trunk/app/display/gimpdisplayshell-scale.h
trunk/app/display/gimpdisplayshell-scroll.c
trunk/app/display/gimpdisplayshell.c
Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c (original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c Sun Aug 10 11:56:29 2008
@@ -303,7 +303,7 @@
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);
}
}
Modified: trunk/app/display/gimpdisplayshell-handlers.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-handlers.c (original)
+++ trunk/app/display/gimpdisplayshell-handlers.c Sun Aug 10 11:56:29 2008
@@ -422,7 +422,7 @@
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 @@
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);
Modified: trunk/app/display/gimpdisplayshell-scale.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scale.c (original)
+++ trunk/app/display/gimpdisplayshell-scale.c Sun Aug 10 11:56:29 2008
@@ -79,14 +79,12 @@
/* 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_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);
Modified: trunk/app/display/gimpdisplayshell-scale.h
==============================================================================
--- trunk/app/display/gimpdisplayshell-scale.h (original)
+++ trunk/app/display/gimpdisplayshell-scale.h Sun Aug 10 11:56:29 2008
@@ -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_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 (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_dialog (GimpDisplayShell *shell);
+void gimp_display_shell_scale_dialog (GimpDisplayShell *shell);
#endif /* __GIMP_DISPLAY_SHELL_SCALE_H__ */
Modified: trunk/app/display/gimpdisplayshell-scroll.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scroll.c (original)
+++ trunk/app/display/gimpdisplayshell-scroll.c Sun Aug 10 11:56:29 2008
@@ -114,7 +114,7 @@
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);
Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c (original)
+++ trunk/app/display/gimpdisplayshell.c Sun Aug 10 11:56:29 2008
@@ -1247,7 +1247,7 @@
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_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 @@
{
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");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
