mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-17 04:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix continuous change of Timeline scroll in playback when viewport is too small

Browse Source
This commit is contained in:
David Capello 2015-09-28 12:34:29 -03:00
parent 6550093f1f
commit 79cd0b258f
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/ui/timeline.cpp
View File

@ -2176,23 +2176,34 @@ void Timeline::updateStatusBar(ui::Message* msg)
void Timeline::showCel(LayerIndex layer, frame_t frame)
{
gfx::Point scroll = getViewScroll();
gfx::Rect viewport = m_viewportArea;
// Add the horizontal bar space to the viewport area if the viewport
// is not big enough to show one cel.
if (m_hbar.isVisible() && viewport.h < LAYSIZE)
viewport.h += m_vbar.getBarWidth();
gfx::Rect celBounds(
m_viewportArea.x + FRMSIZE*frame - scroll.x,
m_viewportArea.y + LAYSIZE*(lastLayer() - layer) - scroll.y,
viewport.x + FRMSIZE*frame - scroll.x,
viewport.y + LAYSIZE*(lastLayer() - layer) - scroll.y,
FRMSIZE, LAYSIZE);
if (celBounds.x < m_viewportArea.x) {
scroll.x -= m_viewportArea.x - celBounds.x;
// Here we use <= instead of < to avoid jumping between this
// condition and the "else if" one when we are playing the
// animation.
if (celBounds.x <= viewport.x) {
scroll.x -= viewport.x - celBounds.x;
}
else if (celBounds.x2() > m_viewportArea.x2()) {
scroll.x += celBounds.x2() - m_viewportArea.x2();
else if (celBounds.x2() > viewport.x2()) {
scroll.x += celBounds.x2() - viewport.x2();
}
if (celBounds.y < m_viewportArea.y) {
scroll.y -= m_viewportArea.y - celBounds.y;
if (celBounds.y <= viewport.y) {
scroll.y -= viewport.y - celBounds.y;
}
else if (celBounds.y2() > m_viewportArea.y2()) {
scroll.y += celBounds.y2() - m_viewportArea.y2();
else if (celBounds.y2() > viewport.y2()) {
scroll.y += celBounds.y2() - viewport.y2();
}
setViewScroll(scroll);