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
71ba58f4
Commit
71ba58f4
authored
Jul 29, 2021
by
Jean-Baptiste Mardelle
Browse files
TImeline guides: add delimiter and highlight active one.
Related to
#1141
parent
39494a12
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
71ba58f4
...
...
@@ -787,6 +787,8 @@ Rectangle {
width
:
label
.
width
+
(
2
*
clipRoot
.
border
.
width
)
height
:
label
.
height
visible
:
clipRoot
.
width
>
width
/
2
anchors.left
:
parent
.
left
anchors.leftMargin
:
clipRoot
.
timeremap
?
labelRect
.
width
:
0
Text
{
// Clip name text
id
:
label
...
...
@@ -877,7 +879,7 @@ Rectangle {
width
:
labelRect
.
height
height
:
labelRect
.
height
anchors.top
:
labelRect
.
top
anchors.left
:
labelRect
.
righ
t
anchors.left
:
nameContainer
.
lef
t
visible
:
!
clipRoot
.
isAudio
&&
clipRoot
.
clipStatus
===
ClipStatus
.
StatusProxy
||
clipRoot
.
clipStatus
===
ClipStatus
.
StatusProxyOnly
Text
{
// Proxy P
...
...
src/timeline2/view/qml/Ruler.qml
View file @
71ba58f4
...
...
@@ -111,24 +111,35 @@ Item {
delegate
:
Item
{
id
:
guideRoot
z
:
proxy
.
position
==
model
.
frame
?
20
:
10
property
bool
activated
:
proxy
.
position
==
model
.
frame
z
:
activated
?
20
:
10
Rectangle
{
id
:
markerBase
width
:
1
height
:
rulerRoot
.
height
x
:
model
.
frame
*
timeline
.
scaleFactor
color
:
model
.
color
color
:
guideRoot
.
activated
?
Qt
.
lighter
(
model
.
color
,
1.3
)
:
model
.
color
property
int
markerId
:
model
.
id
Rectangle
{
visible
:
timeline
.
showMarkers
width
:
mlabel
.
contentWidth
+
4
height
:
guideLabelHeight
radius
:
timeline
.
guidesLocked
?
0
:
height
/
4
color
:
markerBase
.
color
anchors
{
top
:
parent
.
top
left
:
parent
.
left
}
color
:
model
.
color
Rectangle
{
// Shadow delimiting marker start
width
:
1
height
:
guideLabelHeight
color
:
activePalette
.
dark
anchors
{
right
:
parent
.
left
}
}
Text
{
id
:
mlabel
text
:
model
.
comment
...
...
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