Skip to content
GitLab
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
dc8661ee
Commit
dc8661ee
authored
Apr 02, 2020
by
Jean-Baptiste Mardelle
Browse files
Fix composition tooltips
parent
5a0d2e00
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/timeline2/view/qml/Composition.qml
View file @
dc8661ee
...
...
@@ -242,6 +242,22 @@ Item {
masterObject
:
compositionRoot
kfrModel
:
compositionRoot
.
hideCompoViews
?
0
:
compositionRoot
.
keyframeModel
}
ToolTip
{
visible
:
mouseArea
.
containsMouse
&&
!
trimInMouseArea
.
containsMouse
&&
!
trimOutMouseArea
.
containsMouse
&&
!
trimInMouseArea
.
drag
.
active
&&
!
trimOutMouseArea
.
drag
.
active
delay
:
1000
timeout
:
5000
background
:
Rectangle
{
color
:
activePalette
.
alternateBase
border.color
:
activePalette
.
light
}
contentItem
:
Label
{
color
:
activePalette
.
text
font
:
miniFont
text
:
'
%1
\n
%4: %5
'
.
arg
(
label
.
text
)
.
arg
(
i18n
(
"
Duration
"
))
.
arg
(
timeline
.
simplifiedTC
(
compositionRoot
.
clipDuration
))
}
}
}
/*Drag.active: mouseArea.drag.active
Drag.proposedAction: Qt.MoveAction*/
...
...
src/timeline2/view/qml/Track.qml
View file @
dc8661ee
...
...
@@ -372,11 +372,11 @@ Item{
clip
.
lastValidDuration
=
newDuration
clip
.
originalX
=
clip
.
draggedX
// Show amount trimmed as a time in a "bubble" help.
var
delta
=
newDuration
-
clip
.
originalDuration
var
delta
=
clip
.
originalDuration
-
new_duration
var
s
=
timeline
.
simplifiedTC
(
Math
.
abs
(
delta
))
s
=
'
%1%2 = %3
'
.
arg
((
delta
<=
0
)?
'
+
'
:
'
-
'
)
.
arg
(
s
)
.
arg
(
timeline
.
simplifiedTC
(
clipD
uration
))
.
arg
(
timeline
.
simplifiedTC
(
new_d
uration
))
bubbleHelp
.
show
(
clip
.
x
+
clip
.
width
,
trackRoot
.
y
+
trackRoot
.
height
,
s
)
}
}
...
...
@@ -390,11 +390,11 @@ Item{
if
(
new_duration
>
0
)
{
clip
.
lastValidDuration
=
newDuration
// Show amount trimmed as a time in a "bubble" help.
var
delta
=
newDuration
-
clip
.
originalDuration
var
delta
=
clip
.
originalDuration
-
new_duration
var
s
=
timeline
.
simplifiedTC
(
Math
.
abs
(
delta
))
s
=
'
%1%2 = %3
'
.
arg
((
delta
<=
0
)?
'
+
'
:
'
-
'
)
.
arg
(
s
)
.
arg
(
timeline
.
simplifiedTC
(
clipD
uration
))
.
arg
(
timeline
.
simplifiedTC
(
new_d
uration
))
bubbleHelp
.
show
(
clip
.
x
+
clip
.
width
,
trackRoot
.
y
+
trackRoot
.
height
,
s
)
}
}
...
...
Eugen Mohr
@emohr
mentioned in issue
#592 (closed)
·
Apr 02, 2020
mentioned in issue
#592 (closed)
mentioned in issue #592
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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