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

Fix duplicate font declaration

parent 39ac8527
...@@ -22,7 +22,7 @@ import QtQuick.Controls 2.4 ...@@ -22,7 +22,7 @@ import QtQuick.Controls 2.4
Rectangle { Rectangle {
id: rulerRoot id: rulerRoot
// The standard width for labels. Depends on format used (frame number or full timecode) // The standard width for labels. Depends on format used (frame number or full timecode)
property int labelSize: fontMetrics.tightBoundingRect(timeline.timecode(36000)).width property int labelSize: fontMetrics.boundingRect(timeline.timecode(36000)).width
// The spacing between labels. Depends on labelSize // The spacing between labels. Depends on labelSize
property real labelSpacing: labelSize property real labelSpacing: labelSize
// The space we want between each ticks in the ruler // The space we want between each ticks in the ruler
...@@ -49,7 +49,7 @@ Rectangle { ...@@ -49,7 +49,7 @@ Rectangle {
} }
function adjustFormat() { function adjustFormat() {
rulerRoot.labelSize = fontMetrics.tightBoundingRect(timeline.timecode(36000)).width rulerRoot.labelSize = fontMetrics.boundingRect(timeline.timecode(36000)).width
adjustStepSize() adjustStepSize()
repaintRuler() repaintRuler()
} }
......
...@@ -26,7 +26,7 @@ Rectangle { ...@@ -26,7 +26,7 @@ Rectangle {
FontMetrics { FontMetrics {
id: fontMetrics id: fontMetrics
font: smallFont font: miniFont
} }
onDragInProgressChanged: { onDragInProgressChanged: {
......
...@@ -161,11 +161,10 @@ void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, M ...@@ -161,11 +161,10 @@ void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, M
// Create a unique id for this timeline to prevent thumbnails // Create a unique id for this timeline to prevent thumbnails
// leaking from one project to another because of qml's image caching // leaking from one project to another because of qml's image caching
rootContext()->setContextProperty("documentId", QUuid::createUuid()); rootContext()->setContextProperty("documentId", QUuid::createUuid());
rootContext()->setContextProperty("miniFont", QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
rootContext()->setContextProperty("audiorec", pCore->getAudioDevice()); rootContext()->setContextProperty("audiorec", pCore->getAudioDevice());
rootContext()->setContextProperty("guidesModel", pCore->projectManager()->current()->getGuideModel().get()); rootContext()->setContextProperty("guidesModel", pCore->projectManager()->current()->getGuideModel().get());
rootContext()->setContextProperty("clipboard", new ClipboardProxy(this)); rootContext()->setContextProperty("clipboard", new ClipboardProxy(this));
rootContext()->setContextProperty("smallFont", QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont)); rootContext()->setContextProperty("miniFont", QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
const QStringList effs = sortedItems(KdenliveSettings::favorite_effects(), false).values(); const QStringList effs = sortedItems(KdenliveSettings::favorite_effects(), false).values();
const QStringList trans = sortedItems(KdenliveSettings::favorite_transitions(), true).values(); const QStringList trans = sortedItems(KdenliveSettings::favorite_transitions(), true).values();
......
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