oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timeline: fix issue where subtitle text wasn't shown

Browse Source
This commit is contained in:
itsmattkc
2022-07-19 10:23:54 -07:00
parent 55d3915881
commit 9b8c23c994
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/add.cpp
+1 -1
View File
@@ -130,9 +130,9 @@ Node *AddTool::CreateAddableClip(MultiUndoCommand *command, Sequence *sequence,
clip = new SubtitleBlock();
} else {
clip = new ClipBlock();
clip->SetLabel(olive::Tool::GetAddableObjectName(Core::instance()->GetSelectedAddableObject()));
}
clip->set_length_and_media_out(length);
clip->SetLabel(olive::Tool::GetAddableObjectName(Core::instance()->GetSelectedAddableObject()));
NodeGraph* graph = sequence->parent();
app/widget/timelinewidget/view/timelineview.cpp
+1 -1
View File
@@ -490,7 +490,7 @@ void TimelineView::DrawBlock(QPainter *painter, bool foreground, Block *block, q
if (foreground) {
painter->setBrush(Qt::NoBrush);
QString using_label = block->GetLabel().isEmpty() ? block->Name() : block->GetLabel();
QString using_label = block->GetLabelOrName();
QRectF text_rect = r.adjusted(text_padding, text_padding, -text_padding, -text_padding);
painter->setPen(block->is_enabled() ? ColorCoding::GetUISelectorColor(block->color()) : Qt::lightGray);