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
196178f2
Commit
196178f2
authored
Jan 23, 2020
by
Jean-Baptiste Mardelle
Browse files
Fine tune timeline clip elements on smaller track size
parent
c5becebd
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
196178f2
...
...
@@ -313,7 +313,7 @@ Rectangle {
anchors.fill
:
parent
anchors.margins
:
clipRoot
.
border
.
width
//clip: true
property
bool
showDetails
:
!
clipRoot
.
selected
||
!
effectRow
.
visible
property
bool
showDetails
:
(
!
clipRoot
.
selected
||
!
effectRow
.
visible
)
&&
container
.
height
>
2.2
*
labelRect
.
height
Repeater
{
// Clip markers
...
...
@@ -532,18 +532,6 @@ Rectangle {
}
}
KeyframeView
{
id
:
effectRow
clip
:
true
anchors.fill
:
parent
visible
:
clipRoot
.
showKeyframes
&&
clipRoot
.
keyframeModel
selected
:
clipRoot
.
selected
inPoint
:
clipRoot
.
inPoint
outPoint
:
clipRoot
.
outPoint
masterObject
:
clipRoot
kfrModel
:
clipRoot
.
hideClipViews
?
0
:
clipRoot
.
keyframeModel
}
TimelineTriangle
{
// Green fade in triangle
id
:
fadeInTriangle
...
...
@@ -670,6 +658,18 @@ Rectangle {
}
}
}
KeyframeView
{
id
:
effectRow
clip
:
true
anchors.fill
:
parent
visible
:
clipRoot
.
showKeyframes
&&
clipRoot
.
keyframeModel
selected
:
clipRoot
.
selected
inPoint
:
clipRoot
.
inPoint
outPoint
:
clipRoot
.
outPoint
masterObject
:
clipRoot
kfrModel
:
clipRoot
.
hideClipViews
?
0
:
clipRoot
.
keyframeModel
}
}
states
:
[
...
...
@@ -708,7 +708,7 @@ Rectangle {
id
:
compInArea
anchors.left
:
parent
.
left
anchors.bottom
:
parent
.
bottom
width
:
root
.
baseUnit
width
:
Math
.
min
(
root
.
baseUnit
,
container
.
height
/
3
)
height
:
width
hoverEnabled
:
true
cursorShape
:
Qt
.
PointingHandCursor
...
...
@@ -736,7 +736,7 @@ Rectangle {
id
:
compositionIn
anchors.bottom
:
parent
.
bottom
anchors.left
:
parent
.
left
width
:
compInArea
.
containsMouse
?
root
.
baseUnit
:
5
width
:
compInArea
.
containsMouse
?
parent
.
width
:
5
height
:
width
radius
:
width
/
2
visible
:
clipRoot
.
width
>
4
*
parent
.
width
&&
mouseArea
.
containsMouse
&&
!
dragProxyArea
.
pressed
...
...
@@ -752,7 +752,7 @@ Rectangle {
id
:
compOutArea
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
width
:
root
.
baseUnit
width
:
Math
.
min
(
root
.
baseUnit
,
container
.
height
/
3
)
height
:
width
hoverEnabled
:
true
cursorShape
:
Qt
.
PointingHandCursor
...
...
@@ -780,7 +780,7 @@ Rectangle {
id
:
compositionOut
anchors.bottom
:
parent
.
bottom
anchors.right
:
parent
.
right
width
:
compOutArea
.
containsMouse
?
root
.
baseUni
t
:
5
width
:
compOutArea
.
containsMouse
?
parent
.
heigh
t
:
5
height
:
width
radius
:
width
/
2
visible
:
clipRoot
.
width
>
4
*
parent
.
width
&&
mouseArea
.
containsMouse
&&
!
dragProxyArea
.
pressed
...
...
@@ -797,7 +797,7 @@ Rectangle {
anchors.right
:
parent
.
right
anchors.rightMargin
:
clipRoot
.
fadeOut
<=
0
?
0
:
fadeOutCanvas
.
width
-
width
/
2
anchors.top
:
parent
.
top
width
:
root
.
baseUnit
width
:
Math
.
min
(
root
.
baseUnit
,
container
.
height
/
3
)
height
:
width
hoverEnabled
:
true
cursorShape
:
Qt
.
PointingHandCursor
...
...
@@ -850,7 +850,7 @@ Rectangle {
anchors.top
:
parent
.
top
anchors.right
:
clipRoot
.
fadeOut
>
0
?
undefined
:
parent
.
right
anchors.horizontalCenter
:
clipRoot
.
fadeOut
>
0
?
parent
.
horizontalCenter
:
undefined
width
:
fadeOutMouseArea
.
containsMouse
||
Drag
.
active
?
root
.
baseUnit
:
5
width
:
fadeOutMouseArea
.
containsMouse
||
Drag
.
active
?
parent
.
width
:
5
height
:
width
radius
:
width
/
2
color
:
'
darkred
'
...
...
@@ -877,7 +877,7 @@ Rectangle {
anchors.left
:
container
.
left
anchors.leftMargin
:
clipRoot
.
fadeIn
<=
0
?
0
:
(
fadeInTriangle
.
width
-
width
/
2
)
anchors.top
:
parent
.
top
width
:
root
.
baseUnit
width
:
Math
.
min
(
root
.
baseUnit
,
container
.
height
/
3
)
height
:
width
hoverEnabled
:
true
cursorShape
:
Qt
.
PointingHandCursor
...
...
@@ -925,7 +925,7 @@ Rectangle {
anchors.top
:
parent
.
top
anchors.left
:
clipRoot
.
fadeIn
>
0
?
undefined
:
parent
.
left
anchors.horizontalCenter
:
clipRoot
.
fadeIn
>
0
?
parent
.
horizontalCenter
:
undefined
width
:
fadeInMouseArea
.
containsMouse
||
Drag
.
active
?
root
.
baseUnit
:
5
width
:
fadeInMouseArea
.
containsMouse
||
Drag
.
active
?
parent
.
width
:
5
height
:
width
radius
:
width
/
2
color
:
'
green
'
...
...
src/timeline2/view/qml/KeyframeView.qml
View file @
196178f2
...
...
@@ -89,6 +89,7 @@ Rectangle
Item
{
// Keyframes container
anchors.fill
:
parent
z
:
5
visible
:
keyframeContainer
.
selected
&&
keyframeContainer
.
width
>
root
.
baseUnit
*
3
&&
(
kfrCount
<
(
keyframeContainer
.
width
/
root
.
baseUnit
))
Repeater
{
id
:
keyframes
...
...
@@ -119,7 +120,7 @@ Rectangle
anchors.rightMargin
:
-
root
.
baseUnit
/
3
hoverEnabled
:
true
cursorShape
:
Qt
.
SizeHorCursor
visi
ble
:
x
>
root
.
baseUnit
&&
x
<
keyframeContainer
.
width
-
root
.
baseUnit
ena
ble
d
:
parent
.
x
>
root
.
baseUnit
/
2
&&
parent
.
x
<
keyframeContainer
.
width
-
root
.
baseUnit
/
2
drag.target
:
parent
drag.smoothed
:
false
drag.axis
:
Drag
.
XAxis
...
...
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