mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression using Ctrl+C, Ctrl+N, Enter, Ctrl+V

Browse Source 
A common use case is copying a part of one sprite (Ctrl+C), creating a
new image with the clipboard size (Ctrl+N, Enter), and pasting the
clipboard (Ctrl+V). The pasted sprite must be inside the sprite bounds.

Bug report: https://community.aseprite.org/t/problem-pasting-clipboard-content-in-new-image-v1-2-beta10/108
This commit is contained in:
David Capello 2017-06-29 16:03:38 -03:00
parent f329f8b50c
commit b92907237e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/ui/editor/editor.cpp
View File

@ -2079,9 +2079,17 @@ void Editor::pasteImage(const Image* image, const Mask* mask)
y = MID(visibleBounds.y-image->height(), y, visibleBounds.y+visibleBounds.h-1);
}
// Also we always limit the 1 image pixel inside the sprite's bounds.
x = MID(-image->width()+1, x, sprite->width()-1);
y = MID(-image->height()+1, y, sprite->height()-1);
// Limit the image inside the sprite's bounds.
if (sprite->width() <= image->width() ||
sprite->height() <= image->height()) {
x = MID(0, x, sprite->width() - image->width());
y = MID(0, y, sprite->height() - image->height());
}
else {
// Also we always limit the 1 image pixel inside the sprite's bounds.
x = MID(-image->width()+1, x, sprite->width()-1);
y = MID(-image->height()+1, y, sprite->height()-1);
}
}
// Clear brush preview, as the extra cel will be replaced with the