Fix default track height to allow visible record controls

Fixes #629
parent cace11e6
......@@ -104,7 +104,6 @@ Wizard::Wizard(bool autoClose, bool appImageCheck, QWidget *parent)
m_standard.setupUi(page2);*/
setButtonText(QWizard::CancelButton, i18n("Abort"));
setButtonText(QWizard::FinishButton, i18n("OK"));
slotCheckMlt();
if (autoClose) {
// This is a first run instance, check HW encoders
......
......@@ -1760,7 +1760,7 @@ bool MainWindow::readOptions()
}
if (KdenliveSettings::trackheight() == 0) {
QFontMetrics metrics(font());
int trackHeight = 2 * metrics.height();
int trackHeight = 2.2 * metrics.height();
QStyle *style = qApp->style();
trackHeight += style->pixelMetric(QStyle::PM_ToolBarIconSize) + 2 * style->pixelMetric(QStyle::PM_ToolBarItemMargin) +
style->pixelMetric(QStyle::PM_ToolBarItemSpacing) + 2;
......
......@@ -361,7 +361,7 @@ QVariant TimelineItemModel::data(const QModelIndex &index, int role) const
}
int height = getTrackById_const(id)->getProperty("kdenlive:trackheight").toInt();
// qDebug() << "DATA yielding height" << height;
return (height > 0 ? height : 60);
return (height > 0 ? height : KdenliveSettings::trackheight());
}
case ThumbsFormatRole:
return getTrackById_const(id)->getProperty("kdenlive:thumbs_format").toInt();
......
Markdown is supported
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