razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix timeline panning while playback panning disabled (#2525)

Browse source
This commit is contained in:
manongjohn 2019-03-22 05:55:28 -04:00 committed by shun-iwasawa
parent 6858b4fd1e
commit a52b40e600
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
toonz/sources/toonz/xsheetviewer.cpp
View file

@ -1381,13 +1381,19 @@ void XsheetViewer::scrollToHorizontalRange(int x0, int x1) {
if (visibleLeft > x0) { // If they are out of left visible region
int deltaX = x0 - visibleLeft;
scroll(QPoint(deltaX, 0));
return;
if (!TApp::instance()->getCurrentFrame()->isPlaying() ||
Preferences::instance()->isXsheetAutopanEnabled()) {
scroll(QPoint(deltaX, 0));
return;
}
}
if (visibleRight < x1) { // If they are out of right visible region
int deltaX = x1 + 2 - visibleRight;
scroll(QPoint(deltaX, 0));
return;
if (!TApp::instance()->getCurrentFrame()->isPlaying() ||
Preferences::instance()->isXsheetAutopanEnabled()) {
scroll(QPoint(deltaX, 0));
return;
}
}
if (orientation()->isVerticalTimeline())
updateCellColumnAree();