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

Level Strip Drag to Timeline Fix (#1703)

Browse source 
close #1701
This commit is contained in:
manongjohn 2018-01-23 02:28:08 -05:00 committed by shun-iwasawa
parent d5d1aceea7
commit 7b0b701b7e
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
toonz/sources/toonz/xsheetdragtool.cpp
View file

@ -1934,7 +1934,7 @@ public:
m_levels = levels; m_levels = levels;
} }
TRect getLevelFrameRect() { TRect getLevelFrameRect(bool isVertical) {
if (!m_paths.empty()) return TRect(); if (!m_paths.empty()) return TRect();
int maxRow = 0; int maxRow = 0;
int columnCount = m_levels.size(); int columnCount = m_levels.size();
@ -1944,6 +1944,8 @@ public:
int size = fids.size(); int size = fids.size();
if (maxRow < size) maxRow = size; if (maxRow < size) maxRow = size;
} }
if (!isVertical) return TRect(0, 0, maxRow - 1, columnCount - 1);
return TRect(0, 0, columnCount - 1, maxRow - 1); return TRect(0, 0, columnCount - 1, maxRow - 1);
} }
@ -1968,7 +1970,8 @@ protected:
int c = col; int c = col;
int r = row; int r = row;
TXsheet *xsh = getViewer()->getXsheet(); TXsheet *xsh = getViewer()->getXsheet();
TRect rect = m_data->getLevelFrameRect(); TRect rect = m_data->getLevelFrameRect(
getViewer()->orientation()->isVerticalTimeline());
for (c = col; c < rect.getLx() + col; c++) { for (c = col; c < rect.getLx() + col; c++) {
for (r = row; r < rect.getLy() + row; r++) for (r = row; r < rect.getLy() + row; r++)
if (!xsh->getCell(r, c).isEmpty()) return false; if (!xsh->getCell(r, c).isEmpty()) return false;
@ -2069,7 +2072,13 @@ public:
CellPosition beginDragPosition = getViewer()->xyToPosition(m_curPos); CellPosition beginDragPosition = getViewer()->xyToPosition(m_curPos);
TPoint pos(beginDragPosition.layer(), TPoint pos(beginDragPosition.layer(),
beginDragPosition.frame()); // row and cell coordinates beginDragPosition.frame()); // row and cell coordinates
TRect rect = m_data->getLevelFrameRect(); // row and cell coordinates bool isVertical = getViewer()->orientation()->isVerticalTimeline();
if (!isVertical) {
pos.x = beginDragPosition.frame();
pos.y = beginDragPosition.layer();
}
TRect rect =
m_data->getLevelFrameRect(isVertical); // row and cell coordinates
if (rect.isEmpty()) return; if (rect.isEmpty()) return;
rect += pos; rect += pos;
if (rect.x1 < 0 || rect.y1 < 0) return; if (rect.x1 < 0 || rect.y1 < 0) return;