Commit 8c322921 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch '2204'

parents 402450bc ee7a06a3
Pipeline #177705 passed with stage
in 7 minutes and 27 seconds
...@@ -139,7 +139,9 @@ void MixerManager::registerTrack(int tid, std::shared_ptr<Mlt::Tractor> service, ...@@ -139,7 +139,9 @@ void MixerManager::registerTrack(int tid, std::shared_ptr<Mlt::Tractor> service,
m_channelsLayout->insertWidget(0, line); m_channelsLayout->insertWidget(0, line);
m_channelsLayout->insertWidget(0, mixer.get()); m_channelsLayout->insertWidget(0, mixer.get());
m_recommendedWidth = (mixer->minimumWidth() + 12 + line->minimumWidth()) * (qMin(2, int(m_mixers.size()))); m_recommendedWidth = (mixer->minimumWidth() + 12 + line->minimumWidth()) * (qMin(2, int(m_mixers.size())));
if (!KdenliveSettings::mixerCollapse()) {
m_channelsBox->setMinimumWidth(m_recommendedWidth); m_channelsBox->setMinimumWidth(m_recommendedWidth);
}
} }
void MixerManager::deregisterTrack(int tid) void MixerManager::deregisterTrack(int tid)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment