diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index be6843eaf..7afde43ea 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -180,7 +180,7 @@ const double &Track::GetTrackHeight() const void Track::SetTrackHeight(const double &height) { track_height_ = height; - emit TrackHeightChangedInPixels(GetTrackHeightInPixels()); + emit TrackHeightChanged(track_height_); } void Track::InputConnectedEvent(const QString &input, int element, Node *output) diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h index 2ed697e70..ad1eaa5b4 100644 --- a/app/node/output/track/track.h +++ b/app/node/output/track/track.h @@ -425,7 +425,7 @@ signals: /** * @brief Signal emitted when the height of the track has changed */ - void TrackHeightChangedInPixels(int pixel_height); + void TrackHeightChanged(qreal virtual_height); /** * @brief Signal emitted when the muted setting changes diff --git a/app/node/output/track/tracklist.cpp b/app/node/output/track/tracklist.cpp index 6759d54b5..94c90b6ec 100644 --- a/app/node/output/track/tracklist.cpp +++ b/app/node/output/track/tracklist.cpp @@ -81,8 +81,9 @@ void TrackList::TrackConnected(Node *node, int element) UpdateTrackIndexesFrom(cache_index); connect(track, &Track::TrackLengthChanged, this, &TrackList::UpdateTotalLength); - connect(track, &Track::TrackHeightChangedInPixels, this, [this](int height){ - emit TrackHeightChanged(static_cast(sender()), height); + connect(track, &Track::TrackHeightChanged, this, [this](){ + Track *t = static_cast(sender()); + emit TrackHeightChanged(t, t->GetTrackHeightInPixels()); }); track->set_type(type_); diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp index c342e8c32..1ca6e3569 100644 --- a/app/widget/timelinewidget/timelinewidget.cpp +++ b/app/widget/timelinewidget/timelinewidget.cpp @@ -1171,7 +1171,7 @@ void TimelineWidget::AddTrack(Track *track) connect(track, &Track::IndexChanged, this, &TimelineWidget::TrackUpdated); connect(track, &Track::IndexChanged, this, &TimelineWidget::TrackIndexChanged); connect(track, &Track::BlocksRefreshed, this, &TimelineWidget::TrackUpdated); - connect(track, &Track::TrackHeightChangedInPixels, this, &TimelineWidget::TrackUpdated); + connect(track, &Track::TrackHeightChanged, this, &TimelineWidget::TrackUpdated); connect(track, &Track::BlockAdded, this, &TimelineWidget::AddBlock); connect(track, &Track::BlockRemoved, this, &TimelineWidget::RemoveBlock); } @@ -1181,7 +1181,7 @@ void TimelineWidget::RemoveTrack(Track *track) disconnect(track, &Track::IndexChanged, this, &TimelineWidget::TrackUpdated); disconnect(track, &Track::IndexChanged, this, &TimelineWidget::TrackIndexChanged); disconnect(track, &Track::BlocksRefreshed, this, &TimelineWidget::TrackUpdated); - disconnect(track, &Track::TrackHeightChangedInPixels, this, &TimelineWidget::TrackUpdated); + disconnect(track, &Track::TrackHeightChanged, this, &TimelineWidget::TrackUpdated); disconnect(track, &Track::BlockAdded, this, &TimelineWidget::AddBlock); disconnect(track, &Track::BlockRemoved, this, &TimelineWidget::RemoveBlock);