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

timeline: use last track's height when appending a new one

Browse Source
This commit is contained in:
itsmattkc
2022-11-11 11:08:35 -08:00
parent f6cbcf8ef9
commit 0e9cedf690
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/undo/timelineundogeneral.cpp
+3
View File
@@ -126,6 +126,9 @@ void TimelineAddTrackCommand::redo()
// Add track to sequence
track_->setParent(timeline_->GetParentGraph());
if (timeline_->GetTrackCount() > 0) {
track_->SetTrackHeight(timeline_->GetTrackAt(timeline_->GetTrackCount()-1)->GetTrackHeight());
}
timeline_->ArrayAppend();
Node::ConnectEdge(track_, timeline_->track_input(timeline_->ArraySize() - 1));
app/widget/timelinewidget/view/timelineview.cpp
+13 -1
View File
@@ -722,10 +722,22 @@ int TimelineView::GetTrackY(int track_index) const
int TimelineView::GetTrackHeight(int track_index) const
{
if (!connected_track_list_ || track_index >= connected_track_list_->GetTrackCount()) {
if (!connected_track_list_ || connected_track_list_->GetTrackCount() == 0) {
// Handle null or empty track list
return Track::GetDefaultTrackHeightInPixels();
}
if (track_index >= connected_track_list_->GetTrackCount()) {
// Handle new track at the end of the list
return connected_track_list_->GetTrackAt(connected_track_list_->GetTrackCount()-1)->GetTrackHeightInPixels();
}
if (track_index < 0) {
// Handle new track at the beginning of the list
return connected_track_list_->GetTrackAt(0)->GetTrackHeightInPixels();
}
// Track definitely exists, return its actual height
return connected_track_list_->GetTrackAt(track_index)->GetTrackHeightInPixels();
}