Commit 59c9c6d8 authored by Martin Nordholts's avatar Martin Nordholts

Rename border_x to border_width and border_y to border_height.

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

svn path=/trunk/; revision=27891
parent c2b1a616
2009-01-04 Martin Nordholts <martinn@svn.gnome.org>
* app/display/gimpdisplayshell.c (gimp_display_shell_shrink_wrap):
Rename border_x to border_width and border_y to border_height.
2009-01-04 Martin Nordholts <martinn@svn.gnome.org>
Bug 562213 Align Tool doesn't work properly if it is the active
......
......@@ -1856,7 +1856,7 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell,
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 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell,
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 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell,
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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment