Commit 3cef5b52 authored by Ell's avatar Ell

app: behave as if "show all" is disabled in edit/buffers/DnD actions when keeping padding

parent 2d6e80b8
......@@ -74,8 +74,10 @@ buffers_paste_cmd_callback (GimpAction *action,
{
GimpDisplayShell *shell = gimp_display_get_shell (display);
gimp_display_shell_untransform_viewport (shell, ! shell->show_all,
&x, &y, &width, &height);
gimp_display_shell_untransform_viewport (
shell,
! gimp_display_shell_get_infinite_canvas (shell),
&x, &y, &width, &height);
image = gimp_display_get_image (display);
}
......
......@@ -610,8 +610,10 @@ edit_paste (GimpDisplay *display,
/* the actual paste-type conversion happens in gimp_edit_paste() */
}
gimp_display_shell_untransform_viewport (shell, ! shell->show_all,
&x, &y, &width, &height);
gimp_display_shell_untransform_viewport (
shell,
! gimp_display_shell_get_infinite_canvas (shell),
&x, &y, &width, &height);
if (gimp_edit_paste (image, drawable, paste,
paste_type, x, y, width, height))
......
......@@ -179,8 +179,10 @@ gimp_display_shell_dnd_position_item (GimpDisplayShell *shell,
gint x, y;
gint width, height;
gimp_display_shell_untransform_viewport (shell, ! shell->show_all,
&x, &y, &width, &height);
gimp_display_shell_untransform_viewport (
shell,
! gimp_display_shell_get_infinite_canvas (shell),
&x, &y, &width, &height);
off_x = x + (width - item_width) / 2;
off_y = y + (height - item_height) / 2;
......@@ -494,8 +496,10 @@ gimp_display_shell_drop_buffer (GtkWidget *widget,
buffer = GIMP_BUFFER (viewable);
gimp_display_shell_untransform_viewport (shell, ! shell->show_all,
&x, &y, &width, &height);
gimp_display_shell_untransform_viewport (
shell,
! gimp_display_shell_get_infinite_canvas (shell),
&x, &y, &width, &height);
/* FIXME: popup a menu for selecting "Paste Into" */
......@@ -567,10 +571,12 @@ gimp_display_shell_drop_uri_list (GtkWidget *widget,
gint height = gimp_image_get_height (image);
if (gimp_display_get_image (shell->display))
gimp_display_shell_untransform_viewport (shell,
! shell->show_all,
&x, &y,
&width, &height);
{
gimp_display_shell_untransform_viewport (
shell,
! gimp_display_shell_get_infinite_canvas (shell),
&x, &y, &width, &height);
}
gimp_image_add_layers (image, new_layers,
GIMP_IMAGE_ACTIVE_PARENT, -1,
......
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