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

track: emit virtual height rather than pixel height

Browse Source
This commit is contained in:
itsmattkc
2022-11-11 12:29:52 -08:00
parent 0e9cedf690
commit 3302c3633c
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/output/track/track.cpp
+1 -1
View File
@@ -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)
app/node/output/track/track.h
+1 -1
View File
@@ -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
app/node/output/track/tracklist.cpp
+3 -2
View File
@@ -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<Track*>(sender()), height);
connect(track, &Track::TrackHeightChanged, this, [this](){
Track *t = static_cast<Track*>(sender());
emit TrackHeightChanged(t, t->GetTrackHeightInPixels());
});
track->set_type(type_);
app/widget/timelinewidget/timelinewidget.cpp
+2 -2
View File
@@ -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);