Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
a240f282
Commit
a240f282
authored
Mar 20, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix duplicate font declaration
parent
39ac8527
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Ruler.qml
View file @
a240f282
...
...
@@ -22,7 +22,7 @@ import QtQuick.Controls 2.4
Rectangle
{
id
:
rulerRoot
// The standard width for labels. Depends on format used (frame number or full timecode)
property
int
labelSize
:
fontMetrics
.
tightB
oundingRect
(
timeline
.
timecode
(
36000
)).
width
property
int
labelSize
:
fontMetrics
.
b
oundingRect
(
timeline
.
timecode
(
36000
)).
width
// The spacing between labels. Depends on labelSize
property
real
labelSpacing
:
labelSize
// The space we want between each ticks in the ruler
...
...
@@ -49,7 +49,7 @@ Rectangle {
}
function
adjustFormat
()
{
rulerRoot
.
labelSize
=
fontMetrics
.
tightB
oundingRect
(
timeline
.
timecode
(
36000
)).
width
rulerRoot
.
labelSize
=
fontMetrics
.
b
oundingRect
(
timeline
.
timecode
(
36000
)).
width
adjustStepSize
()
repaintRuler
()
}
...
...
src/timeline2/view/qml/timeline.qml
View file @
a240f282
...
...
@@ -26,7 +26,7 @@ Rectangle {
FontMetrics
{
id
:
fontMetrics
font
:
small
Font
font
:
mini
Font
}
onDragInProgressChanged
:
{
...
...
src/timeline2/view/timelinewidget.cpp
View file @
a240f282
...
...
@@ -161,11 +161,10 @@ void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, M
// Create a unique id for this timeline to prevent thumbnails
// leaking from one project to another because of qml's image caching
rootContext
()
->
setContextProperty
(
"documentId"
,
QUuid
::
createUuid
());
rootContext
()
->
setContextProperty
(
"miniFont"
,
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
));
rootContext
()
->
setContextProperty
(
"audiorec"
,
pCore
->
getAudioDevice
());
rootContext
()
->
setContextProperty
(
"guidesModel"
,
pCore
->
projectManager
()
->
current
()
->
getGuideModel
().
get
());
rootContext
()
->
setContextProperty
(
"clipboard"
,
new
ClipboardProxy
(
this
));
rootContext
()
->
setContextProperty
(
"
small
Font"
,
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
));
rootContext
()
->
setContextProperty
(
"
mini
Font"
,
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
));
const
QStringList
effs
=
sortedItems
(
KdenliveSettings
::
favorite_effects
(),
false
).
values
();
const
QStringList
trans
=
sortedItems
(
KdenliveSettings
::
favorite_transitions
(),
true
).
values
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment