Skip to content
GitLab
Menu
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
84e71861
Commit
84e71861
authored
Jul 20, 2020
by
Jean-Baptiste Mardelle
Browse files
Reset track height to sane value on reset default values in settings dialog
parent
1186f306
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dialogs/kdenlivesettingsdialog.cpp
View file @
84e71861
...
...
@@ -70,7 +70,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
{
KdenliveSettings
::
setV4l_format
(
0
);
QWidget
*
p1
=
new
QWidget
;
QFontInfo
ftInfo
(
font
());
m_configMisc
.
setupUi
(
p1
);
m_page1
=
addPage
(
p1
,
i18n
(
"Misc"
));
m_page1
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"configure"
)));
...
...
@@ -116,7 +115,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QMap<QString, QString> mappable_a
m_configTimeline
.
setupUi
(
p3
);
m_page3
=
addPage
(
p3
,
i18n
(
"Timeline"
));
m_page3
->
setIcon
(
QIcon
::
fromTheme
(
QStringLiteral
(
"video-display"
)));
m_configTimeline
.
kcfg_trackheight
->
setMinimum
(
ftInfo
.
pixelSize
()
*
1.5
);
QWidget
*
p2
=
new
QWidget
;
m_configEnv
.
setupUi
(
p2
);
...
...
@@ -865,6 +863,21 @@ void KdenliveSettingsDialog::updateSettings()
m_configEnv
.
ffprobeurl
->
setText
(
KdenliveSettings
::
ffprobepath
());
}
if
(
m_configTimeline
.
kcfg_trackheight
->
value
()
==
0
)
{
QFont
ft
=
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
);
// Default unit for timeline.qml objects size
int
baseUnit
=
qMax
(
28
,
(
int
)
(
QFontInfo
(
ft
).
pixelSize
()
*
1.8
+
0.5
));
int
trackHeight
=
qMax
(
50
,
(
int
)
(
2.2
*
baseUnit
+
6
));
m_configTimeline
.
kcfg_trackheight
->
setValue
(
trackHeight
);
}
else
{
QFont
ft
=
QFontDatabase
::
systemFont
(
QFontDatabase
::
SmallestReadableFont
);
// Default unit for timeline.qml objects size
int
baseUnit
=
qMax
(
28
,
(
int
)
(
QFontInfo
(
ft
).
pixelSize
()
*
1.8
+
0.5
));
if
(
m_configTimeline
.
kcfg_trackheight
->
value
()
<
baseUnit
)
{
m_configTimeline
.
kcfg_trackheight
->
setValue
(
baseUnit
);
}
}
bool
resetConsumer
=
false
;
bool
fullReset
=
false
;
bool
updateCapturePath
=
false
;
...
...
src/ui/configtimeline_ui.ui
View file @
84e71861
...
...
@@ -87,7 +87,7 @@
<item>
<widget
class=
"QSpinBox"
name=
"kcfg_trackheight"
>
<property
name=
"minimum"
>
<number>
1
0
</number>
<number>
0
</number>
</property>
<property
name=
"maximum"
>
<number>
999
</number>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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