Vertically center timeline text
This commit is contained in:
parent
c5750d5af7
commit
58ad5fe620
2 changed files with 10 additions and 4 deletions
|
@ -995,6 +995,8 @@ void ColumnArea::DrawHeader::drawColumnNumber() const {
|
||||||
|
|
||||||
int valign = o->isVerticalTimeline() ? Qt::AlignVCenter : Qt::AlignBottom;
|
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,
|
p.drawText(pos, Qt::AlignHCenter | valign | Qt::TextSingleLine,
|
||||||
QString::number(col + 1));
|
QString::number(col + 1));
|
||||||
}
|
}
|
||||||
|
@ -1072,7 +1074,11 @@ void ColumnArea::DrawHeader::drawColumnName() const {
|
||||||
return;
|
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,
|
Qt::AlignLeft | valign | Qt::TextSingleLine,
|
||||||
QString(name.c_str()));
|
QString(name.c_str()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -985,11 +985,11 @@ LeftToRightOrientation::LeftToRightOrientation() {
|
||||||
addRect(PredefinedRect::DRAG_HANDLE_CORNER,
|
addRect(PredefinedRect::DRAG_HANDLE_CORNER,
|
||||||
QRect(0, 0, CELL_WIDTH, CELL_DRAG_HEIGHT));
|
QRect(0, 0, CELL_WIDTH, CELL_DRAG_HEIGHT));
|
||||||
QRect keyRect((CELL_WIDTH - KEY_ICON_WIDTH) / 2,
|
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);
|
KEY_ICON_HEIGHT);
|
||||||
addRect(PredefinedRect::KEY_ICON, keyRect);
|
addRect(PredefinedRect::KEY_ICON, keyRect);
|
||||||
addRect(PredefinedRect::CAMERA_KEY_ICON, keyRect.adjusted(0, -4, 0, -4));
|
addRect(PredefinedRect::CAMERA_KEY_ICON, keyRect.adjusted(0, -3, 0, -3));
|
||||||
QRect nameRect = cellRect.adjusted(4, 4, -6, 0);
|
QRect nameRect = cellRect.adjusted(4, 3, -6, -1);
|
||||||
addRect(PredefinedRect::CELL_NAME, nameRect);
|
addRect(PredefinedRect::CELL_NAME, nameRect);
|
||||||
addRect(PredefinedRect::CELL_NAME_WITH_KEYFRAME, nameRect);
|
addRect(PredefinedRect::CELL_NAME_WITH_KEYFRAME, nameRect);
|
||||||
addRect(PredefinedRect::END_EXTENDER,
|
addRect(PredefinedRect::END_EXTENDER,
|
||||||
|
|
Loading…
Reference in a new issue