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

Limit X/Y pasted position separately by axis (#1447)

Browse Source 
Use case:
https://github.com/aseprite/aseprite/issues/1447#issuecomment-310582226
This commit is contained in:
David Capello 2017-06-23 06:29:36 -03:00
parent ab39ec63a8
commit 5e24be7ef7
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

@ -2043,18 +2043,26 @@ void Editor::pasteImage(const Image* image, const Mask* mask)
int x = mask->bounds().x;
int y = mask->bounds().y;
{
Rect visibleBounds = getVisibleSpriteBounds();
const Rect visibleBounds = getVisibleSpriteBounds();
const Point maskCenter = mask->bounds().center();
// If the pasted image original location center point isn't
// visible, we center the image in the editor's visible bounds.
if (!visibleBounds.contains(mask->bounds().center())) {
if (maskCenter.x < visibleBounds.x ||
maskCenter.x >= visibleBounds.x2()) {
x = visibleBounds.x + visibleBounds.w/2 - image->width()/2;
y = visibleBounds.y + visibleBounds.h/2 - image->height()/2;
}
// In other case, if the center is visible, we put the pasted
// image in its original location.
else {
x = MID(visibleBounds.x-image->width(), x, visibleBounds.x+visibleBounds.w-1);
}
if (maskCenter.y < visibleBounds.y ||
maskCenter.y >= visibleBounds.y2()) {
y = visibleBounds.y + visibleBounds.h/2 - image->height()/2;
}
else {
y = MID(visibleBounds.y-image->height(), y, visibleBounds.y+visibleBounds.h-1);
}