gimp r27891 - in trunk: . app/display

[martinn svn gnome org]

Author: martinn
Date: Sun Jan  4 13:36:59 2009
New Revision: 27891
URL: http://svn.gnome.org/viewvc/gimp?rev=27891&view=rev

Log:
* app/display/gimpdisplayshell.c (gimp_display_shell_shrink_wrap):
Rename border_x to border_width and border_y to border_height.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell.c

Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c	(original)
+++ trunk/app/display/gimpdisplayshell.c	Sun Jan  4 13:36:59 2009
@@ -1856,7 +1856,7 @@
   gint          disp_width, disp_height;
   gint          width, height;
   gint          max_auto_width, max_auto_height;
-  gint          border_x, border_y;
+  gint          border_width, border_height;
   gboolean      resize = FALSE;
 
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
@@ -1876,20 +1876,20 @@
   disp_width  = shell->disp_width;
   disp_height = shell->disp_height;
 
-  border_x = widget->allocation.width  - disp_width;
-  border_y = widget->allocation.height - disp_height;
+  border_width  = widget->allocation.width  - disp_width;
+  border_height = widget->allocation.height - disp_height;
 
-  max_auto_width  = (rect.width  - border_x) * 0.75;
-  max_auto_height = (rect.height - border_y) * 0.75;
+  max_auto_width  = (rect.width  - border_width)  * 0.75;
+  max_auto_height = (rect.height - border_height) * 0.75;
 
   /* If one of the display dimensions has changed and one of the
    * dimensions fits inside the screen
    */
-  if (((width + border_x) < rect.width || (height + border_y) < rect.height) &&
+  if (((width + border_width) < rect.width || (height + border_height) < rect.height) &&
       (width != disp_width || height != disp_height))
     {
-      width  = ((width  + border_x) < rect.width)  ? width  : max_auto_width;
-      height = ((height + border_y) < rect.height) ? height : max_auto_height;
+      width  = ((width  + border_width)  < rect.width)  ? width  : max_auto_width;
+      height = ((height + border_height) < rect.height) ? height : max_auto_height;
 
       resize = TRUE;
     }
@@ -1911,8 +1911,8 @@
       if (width < shell->statusbar->requisition.width)
         width = shell->statusbar->requisition.width;
 
-      width  = width  + border_x;
-      height = height + border_y;
+      width  = width  + border_width;
+      height = height + border_height;
 
       if (grow_only)
         {