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
becb2f6f
Commit
becb2f6f
authored
Mar 27, 2020
by
Jean-Baptiste Mardelle
Browse files
Improve timeline AppImage font
parent
3bc09d50
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/core.cpp
View file @
becb2f6f
...
...
@@ -88,7 +88,7 @@ void Core::build(bool isAppImage, const QString &MltPath)
qRegisterMetaType
<
QVector
<
int
>>
();
qRegisterMetaType
<
QDomElement
>
(
"QDomElement"
);
qRegisterMetaType
<
requestClipInfo
>
(
"requestClipInfo"
);
if
(
isAppImage
)
{
QString
appPath
=
qApp
->
applicationDirPath
();
KdenliveSettings
::
setFfmpegpath
(
QDir
::
cleanPath
(
appPath
+
QStringLiteral
(
"/ffmpeg"
)));
...
...
src/timeline2/view/qml/TrackHead.qml
View file @
becb2f6f
...
...
@@ -222,14 +222,8 @@ Rectangle {
background
:
Rectangle
{
color
:
trackLed
.
bgColor
}
FontMetrics
{
id
:
textMetricsLed
font
:
miniFont
}
width
:
(
Math
.
ceil
(
textMetricsLed
.
averageCharacterWidth
*
trackLed
.
text
.
length
*
1.2
))
width
:
fontMetrics
.
boundingRect
(
"
M
"
).
width
*
trackLed
.
text
.
length
y
:
1
leftPadding
:
0
rightPadding
:
0
verticalAlignment
:
Text
.
AlignVCenter
horizontalAlignment
:
Text
.
AlignHCenter
MouseArea
{
...
...
src/timeline2/view/timelinewidget.cpp
View file @
becb2f6f
...
...
@@ -164,7 +164,10 @@ void TimelineWidget::setModel(const std::shared_ptr<TimelineItemModel> &model, M
rootContext
()
->
setContextProperty
(
"audiorec"
,
pCore
->
getAudioDevice
());
rootContext
()
->
setContextProperty
(
"guidesModel"
,
pCore
->
projectManager
()
->
current
()
->
getGuideModel
().
get
());
rootContext
()
->
setContextProperty
(
"clipboard"
,
new
ClipboardProxy
(
this
));
rootContext
()
->
setContextProperty
(
"miniFont"
,
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
));
QFont
ft
=
QFontDatabase
::
systemFont
(
QFontDatabase
::
GeneralFont
);
ft
.
setPixelSize
(
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
).
pixelSize
());
setFont
(
ft
);
rootContext
()
->
setContextProperty
(
"miniFont"
,
font
());
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