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
6bfa9a43
Commit
6bfa9a43
authored
Nov 25, 2020
by
Jean-Baptiste Mardelle
Browse files
Drop semi-working clip name offset in timeline
parent
14a15e89
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Clip.qml
View file @
6bfa9a43
...
...
@@ -81,7 +81,6 @@ Rectangle {
property
var
groupTrimData
property
int
scrollStart
:
scrollView
.
contentX
-
(
clipRoot
.
modelStart
*
timeline
.
scaleFactor
)
property
int
mouseXPos
:
mouseArea
.
mouseX
property
double
clipNameOffset
:
isAudio
||
parentTrack
.
trackThumbsFormat
>
0
?
clipRoot
.
border
.
width
:
(
clipRoot
.
border
.
width
+
(
container
.
height
*
root
.
dar
*
2
))
<
container
.
width
?
clipRoot
.
border
.
width
+
container
.
height
*
root
.
dar
:
clipRoot
.
border
.
width
width
:
clipDuration
*
timeScale
opacity
:
dragProxyArea
.
drag
.
active
&&
dragProxy
.
draggedItem
==
clipId
?
0.8
:
1.0
...
...
@@ -184,10 +183,15 @@ Rectangle {
onTimeScaleChanged
:
{
x
=
modelStart
*
timeScale
;
width
=
clipDuration
*
timeScale
;
labelRect
.
x
=
scrollX
>
modelStart
*
timeScale
?
scrollX
-
modelStart
*
timeScale
:
clipRoot
.
clipName
Offset
updateLabel
Offset
()
}
onScrollXChanged
:
{
labelRect
.
x
=
scrollX
>
modelStart
*
timeScale
?
scrollX
-
modelStart
*
timeScale
:
clipRoot
.
clipNameOffset
updateLabelOffset
()
}
function
updateLabelOffset
()
{
labelRect
.
x
=
scrollX
>
modelStart
*
timeScale
?
scrollX
-
modelStart
*
timeScale
:
clipRoot
.
border
.
width
}
border.color
:
(
clipStatus
==
ClipStatus
.
StatusMissing
||
ClipStatus
==
ClipStatus
.
StatusWaiting
||
clipStatus
==
ClipStatus
.
StatusDeleting
)
?
"
#ff0000
"
:
selected
?
root
.
selectionColor
:
grouped
?
root
.
groupColor
:
borderColor
...
...
@@ -741,6 +745,7 @@ Rectangle {
// Clip name background
id
:
labelRect
color
:
clipRoot
.
selected
?
'
darkred
'
:
'
#66000000
'
x
:
clipRoot
.
border
.
width
y
:
0
width
:
label
.
width
+
2
*
clipRoot
.
border
.
width
height
:
label
.
height
...
...
src/timeline2/view/qml/ClipThumbs.qml
View file @
6bfa9a43
...
...
@@ -12,7 +12,6 @@ Row {
property
bool
fixedThumbs
:
clipRoot
.
itemType
==
ProducerType
.
Image
||
clipRoot
.
itemType
==
ProducerType
.
Text
||
clipRoot
.
itemType
==
ProducerType
.
TextTemplate
property
int
thumbWidth
:
container
.
height
*
root
.
dar
property
bool
enableCache
:
clipRoot
.
itemType
==
ProducerType
.
Video
||
clipRoot
.
itemType
==
ProducerType
.
AV
function
reload
(
reset
)
{
//console.log('+++++\n\ntriggered ML thumb reload\n\n++++++++++++++')
clipRoot
.
baseThumbPath
=
clipRoot
.
variableThumbs
?
''
:
'
image://thumbnail/
'
+
clipRoot
.
binId
+
'
/
'
+
Math
.
random
()
+
'
/#
'
...
...
Write
Preview
Supports
Markdown
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