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

Merge pull request #853 from manongjohn/fix_note_cell_appearance

Browse source 
Fix Note Text cell issues
This commit is contained in:
manongjohn 2022-01-14 15:42:47 -05:00 committed by GitHub
commit 43cfbc5dc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -1393,7 +1393,7 @@ void CellArea::drawCells(QPainter &p, const QRect toBeUpdated) {
// drawSoundTextCell(p, row, col);
else
drawLevelCell(p, row, col, isReference, showLevelName);
}
}
}
// draw vertical line
@ -1606,8 +1606,6 @@ void CellArea::drawSoundCell(QPainter &p, int row, int col, bool isReference) {
return;
}
if (o->isVerticalTimeline() || !row) drawFrameSeparator(p, row, col, false);
TXshSoundLevelP soundLevel = cell.getSoundLevel();
int r0, r1;
@ -1647,6 +1645,8 @@ void CellArea::drawSoundCell(QPainter &p, int row, int col, bool isReference) {
// cell mark
drawCellMarker(p, markId, rect, true, isNextEmpty);
if (o->isVerticalTimeline() || !row) drawFrameSeparator(p, row, col, false);
if (TApp::instance()->getCurrentFrame()->isEditingScene() &&
!m_viewer->orientation()->isVerticalTimeline() &&
row == m_viewer->getCurrentRow() &&
@ -1671,7 +1671,7 @@ void CellArea::drawSoundCell(QPainter &p, int row, int col, bool isReference) {
int offset =
row - cell.getFrameId().getNumber(); // rows since start of the clip
int begin = timeBounds.from(); // time axis
int end = timeBounds.to();
int end = timeBounds.to() + 1;
int soundPixel = o->rowToFrameAxis(row) -
o->rowToFrameAxis(offset); // pixels since start of clip
@ -2436,21 +2436,38 @@ void CellArea::drawSoundTextColumn(QPainter &p, int r0, int r1, int col) {
QPoint xy;
int markId;
QRect nameRect;
bool isEndOfRange;
};
auto getCellInfo = [&](int r) {
CellInfo ret;
ret.row = r;
ret.xy = m_viewer->positionToXY(CellPosition(r, col));
ret.row = r;
ret.xy = m_viewer->positionToXY(CellPosition(r, col));
if (r == 0) {
if (o->isVerticalTimeline())
ret.xy.setY(ret.xy.y() + 1);
else
ret.xy.setX(ret.xy.x() + 1);
}
QPoint frameAdj = m_viewer->getFrameZoomAdjustment();
QRect cellRect = o->rect(PredefinedRect::CELL).translated(ret.xy);
cellRect.adjust(0, 0, -frameAdj.x(), -frameAdj.y());
ret.rect = cellRect.adjusted(1, 1, 0, 1);
TXshCell nextCell = xsh->getCell(r + 1, col);
ret.isEndOfRange = nextCell.isEmpty();
ret.rect = cellRect.adjusted(
(!m_viewer->orientation()->isVerticalTimeline() && r == 0 ? 0 : 1), 1,
(!m_viewer->orientation()->isVerticalTimeline() && !nextCell.isEmpty()
? 2
: 0),
0);
ret.markId = xsh->getColumn(col)->getCellColumn()->getCellMark(r);
ret.nameRect = o->rect(PredefinedRect::CELL_NAME)
.translated(ret.xy)
.adjusted(0, 0, -frameAdj.x(), -frameAdj.y());
ret.nameRect =
o->rect(PredefinedRect::CELL_NAME)
.translated(ret.xy)
.adjusted(
(!m_viewer->orientation()->isVerticalTimeline() && r == 0 ? -1
: 0),
0, -frameAdj.x(), -frameAdj.y());
return ret;
};
@ -2538,7 +2555,13 @@ void CellArea::drawSoundTextColumn(QPainter &p, int r0, int r1, int col) {
QColor tmpCellColor = (isSelected) ? selectedCellColor : cellColor;
if (!o->isVerticalTimeline() && info.row != rowTo)
info.rect.adjust(0, 0, 2, 0);
p.fillRect(info.rect, QBrush(tmpCellColor));
if (o->isVerticalTimeline())
// Paint the cell edge-to-edge, we use LightLineColor with low opacity
// to pick up the hue of the cell color to make the separator line more
// pleasing to the eye.
p.fillRect(info.rect.adjusted(0, 0, 0, 1), QBrush(tmpCellColor));
else
p.fillRect(info.rect, QBrush(tmpCellColor));
// cell mark
drawCellMarker(p, info.markId, info.rect, true);
@ -2551,7 +2574,7 @@ void CellArea::drawSoundTextColumn(QPainter &p, int r0, int r1, int col) {
drawCurrentTimeIndicator(p, info.xy);
drawDragHandle(p, info.xy, sideColor);
drawEndOfDragHandle(p, info.row == rowTo, info.xy, tmpCellColor);
drawEndOfDragHandle(p, info.isEndOfRange, info.xy, tmpCellColor);
drawLockedDottedLine(p, xsh->getColumn(col)->isLocked(), info.xy,
tmpCellColor);
}
@ -2641,13 +2664,16 @@ void CellArea::drawSoundTextColumn(QPainter &p, int r0, int r1, int col) {
int margin = extraWidth / (2 * textCount);
// Qt::TextJustificationForced flag is needed to make Qt::AlignJustify
// to work on the single-line text
p.drawText(
unitedRect.adjusted(margin, 0, -margin, 0),
Qt::TextJustificationForced | Qt::AlignJustify | Qt::AlignVCenter,
text);
p.drawText(unitedRect.adjusted(margin, 0, -margin, 0),
Qt::AlignHCenter | Qt::AlignBottom, text);
} else {
QString elided = elideText(text, fm, unitedRect.width(), "~");
p.drawText(unitedRect, Qt::AlignLeft | Qt::AlignVCenter, elided);
QFontMetrics metric(font);
// If text wider than box, shift box left to display 1st character
int charWidth = metric.width(elided, 1);
if ((charWidth * 2) > unitedRect.width())
unitedRect.adjust(-2, 0, 4, 0);
p.drawText(unitedRect, Qt::AlignLeft | Qt::AlignBottom, elided);
}
}