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

Vertically center timeline text

Browse source
This commit is contained in:
manongjohn 2021-08-29 13:44:01 -04:00
parent c5750d5af7
commit 58ad5fe620
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/toonz/xshcolumnviewer.cpp
View file

@ -995,6 +995,8 @@ void ColumnArea::DrawHeader::drawColumnNumber() const {
int valign = o->isVerticalTimeline() ? Qt::AlignVCenter : Qt::AlignBottom;
if (!o->isVerticalTimeline()) pos.adjust(0, -1, 0, -1);
p.drawText(pos, Qt::AlignHCenter | valign | Qt::TextSingleLine,
QString::number(col + 1));
}
@ -1072,7 +1074,11 @@ void ColumnArea::DrawHeader::drawColumnName() const {
return;
}
p.drawText(columnName.adjusted(leftadj, 0, rightadj, 0),
int vertAdj = 0;
if (!o->isVerticalTimeline()) vertAdj = col < 0 || isEmpty ? -4 : -1;
p.drawText(columnName.adjusted(leftadj, vertAdj, rightadj, vertAdj),
Qt::AlignLeft | valign | Qt::TextSingleLine,
QString(name.c_str()));
}

6
toonz/sources/toonzlib/orientation.cpp
View file

@ -985,11 +985,11 @@ LeftToRightOrientation::LeftToRightOrientation() {
addRect(PredefinedRect::DRAG_HANDLE_CORNER,
QRect(0, 0, CELL_WIDTH, CELL_DRAG_HEIGHT));
QRect keyRect((CELL_WIDTH - KEY_ICON_WIDTH) / 2,
CELL_HEIGHT - KEY_ICON_HEIGHT - 2, KEY_ICON_WIDTH,
CELL_HEIGHT - KEY_ICON_HEIGHT - 3, KEY_ICON_WIDTH,
KEY_ICON_HEIGHT);
addRect(PredefinedRect::KEY_ICON, keyRect);
addRect(PredefinedRect::CAMERA_KEY_ICON, keyRect.adjusted(0, -4, 0, -4));
QRect nameRect = cellRect.adjusted(4, 4, -6, 0);
addRect(PredefinedRect::CAMERA_KEY_ICON, keyRect.adjusted(0, -3, 0, -3));
QRect nameRect = cellRect.adjusted(4, 3, -6, -1);
addRect(PredefinedRect::CELL_NAME, nameRect);
addRect(PredefinedRect::CELL_NAME_WITH_KEYFRAME, nameRect);
addRect(PredefinedRect::END_EXTENDER,