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
05d24a01
Commit
05d24a01
authored
Mar 30, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix timeline tracks collapsed height
parent
245e292c
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/core.cpp
View file @
05d24a01
...
...
@@ -129,7 +129,7 @@ void Core::initGUI(const QUrl &Url, const QString &clipsToLoad)
m_guiConstructed
=
true
;
QStringList
styles
=
QQuickStyle
::
availableStyles
();
if
(
styles
.
contains
(
QLatin1String
(
"Plasma"
)))
{
QQuickStyle
::
setStyle
(
"Plasma"
);
//
QQuickStyle::setStyle("Plasma");
}
else
if
(
styles
.
contains
(
QLatin1String
(
"org.kde.desktop"
)))
{
QQuickStyle
::
setStyle
(
"org.kde.desktop"
);
}
else
if
(
styles
.
contains
(
QLatin1String
(
"Fusion"
)))
{
...
...
src/timeline2/view/qml/TrackHead.qml
View file @
05d24a01
...
...
@@ -33,9 +33,8 @@ Rectangle {
property
bool
showAudioRecord
:
false
property
bool
current
:
false
property
int
myTrackHeight
property
int
collapsedHeight
:
expandButton
.
height
property
int
trackId
:
-
42
property
int
buttonSize
:
root
.
collapsedHeight
property
int
iconSize
:
buttonSize
-
4
property
string
trackTag
property
int
thumbsFormat
:
0
border.width
:
1
...
...
@@ -95,7 +94,7 @@ Rectangle {
}
Item
{
id
:
targetColumn
width
:
trackHeadRoot
.
buttonSize
*
.
4
width
:
root
.
collapsedHeight
*
.
4
height
:
trackHeadRoot
.
height
Item
{
anchors.fill
:
parent
...
...
@@ -298,7 +297,7 @@ Rectangle {
}
Row
{
width
:
childrenRect
.
width
x
:
Math
.
max
(
2
*
trackHeadRoot
.
buttonSize
+
2
,
parent
.
width
-
width
-
4
)
x
:
Math
.
max
(
2
*
root
.
collapsedHeight
+
2
,
parent
.
width
-
width
-
4
)
spacing
:
0
id
:
buttonsRow
ToolButton
{
...
...
@@ -380,12 +379,12 @@ Rectangle {
}
Item
{
id
:
recLayout
y
:
trackHeadRoot
.
buttonSize
+
4
y
:
root
.
collapsedHeight
+
4
//width: trackHeadRoot.width
anchors.left
:
trackHeadColumn
.
left
anchors.right
:
trackHeadColumn
.
right
anchors.margins
:
2
height
:
showAudioRecord
?
trackHeadRoot
.
buttonSize
:
0
height
:
showAudioRecord
?
root
.
collapsedHeight
:
0
Loader
{
id
:
audioVuMeter
anchors.fill
:
parent
...
...
src/timeline2/view/qml/timeline.qml
View file @
05d24a01
...
...
@@ -686,6 +686,9 @@ Rectangle {
height
:
model
.
trackHeight
onIsLockedChanged
:
tracksRepeater
.
itemAt
(
index
).
isLocked
=
isLocked
collapsed
:
height
<=
root
.
collapsedHeight
Component.onCompleted
:
{
root
.
collapsedHeight
=
collapsedHeight
}
onMyTrackHeightChanged
:
{
collapsed
=
myTrackHeight
<=
root
.
collapsedHeight
if
(
!
collapsed
)
{
...
...
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