Commit 343721d2 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Merge branch '2112'

parents cc809b50 c89ff3ef
Pipeline #96906 passed with stage
in 9 minutes and 9 seconds
......@@ -198,7 +198,7 @@ QList<int> TimelineModel::getTracksIds(bool audio) const
auto it = m_allTracks.cbegin();
while (it != m_allTracks.cend()) {
if ((*it)->isAudioTrack() == audio) {
trackIds.insert(-1, (*it)->getId());
trackIds.insert(0, (*it)->getId());
}
++it;
}
......
......@@ -22,7 +22,7 @@ ProgressButton::ProgressButton(const QString &text, double max, QWidget *parent)
m_progressFont = font();
m_progressFont.setPixelSize(m_iconSize / 2);
initStyleOption(&m_buttonStyle);
QPixmap pix(1, 1);
QPixmap pix(m_iconSize, m_iconSize);
pix.fill(Qt::transparent);
m_dummyAction = new QAction(QIcon(pix), text, this);
}
......
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