[aseprite] 62/308: Now the handles snap to the edge of viewport

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 2537b76cda1b76e7e946935d08352351a5bbbe2b
Author: Ying Ruei Liang (KK) <thumbd03803 at gmail.com>
Date:   Sun Dec 6 21:56:53 2015 +0800

    Now the handles snap to the edge of viewport
---
 src/app/ui/editor/standby_state.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/ui/editor/standby_state.cpp b/src/app/ui/editor/standby_state.cpp
index b7f3226..6d09717 100644
--- a/src/app/ui/editor/standby_state.cpp
+++ b/src/app/ui/editor/standby_state.cpp
@@ -684,15 +684,18 @@ bool StandbyState::Decorator::getSymmetryHandles(Editor* editor, gfx::Rect& box1
       int pos = (horz ? symmetry.xAxis():
                         symmetry.yAxis());
       gfx::Rect spriteBounds = editor->sprite()->bounds();
+      gfx::Rect editorViewport = View::getView(editor)->viewportBounds();
       skin::SkinTheme* theme = static_cast<skin::SkinTheme*>(CurrentTheme::get());
       she::Surface* part = theme->parts.transformationHandle()->bitmap(0);
       gfx::Point pt1, pt2;
+
       if (horz) {
         pt1 = gfx::Point(spriteBounds.x+pos, spriteBounds.y);
         pt1 = editor->editorToScreen(pt1);
         pt2 = gfx::Point(spriteBounds.x+pos, spriteBounds.y+spriteBounds.h);
         pt2 = editor->editorToScreen(pt2);
-        pt1.y -= part->height();
+        pt1.y = std::max(pt1.y-part->height(), editorViewport.y);
+        pt2.y = std::min(pt2.y, editorViewport.point2().y-part->height());
         pt1.x -= part->width()/2;
         pt2.x -= part->width()/2;
       }
@@ -701,7 +704,8 @@ bool StandbyState::Decorator::getSymmetryHandles(Editor* editor, gfx::Rect& box1
         pt1 = editor->editorToScreen(pt1);
         pt2 = gfx::Point(spriteBounds.x+spriteBounds.w, spriteBounds.y+pos);
         pt2 = editor->editorToScreen(pt2);
-        pt1.x -= part->width();
+        pt1.x = std::max(pt1.x-part->width(), editorViewport.x);
+        pt2.x = std::min(pt2.x, editorViewport.point2().x-part->width());
         pt1.y -= part->height()/2;
         pt2.y -= part->height()/2;
       }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git