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
09c6656a
Commit
09c6656a
authored
Mar 23, 2021
by
Jean-Baptiste Mardelle
Browse files
Clip monitor: use marker category's color as background
parent
b2635a9b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/monitor/view/MonitorRuler.qml
View file @
09c6656a
...
...
@@ -553,7 +553,6 @@ Rectangle {
}
Rectangle
{
visible
:
!
rulerMouseArea
.
pressed
&&
(
guideArea
.
containsMouse
||
(
rulerMouseArea
.
containsMouse
&&
Math
.
abs
(
rulerMouseArea
.
mouseX
-
markerBase
.
x
)
<
4
))
opacity
:
0.7
property
int
guidePos
:
markerBase
.
x
-
mlabel
.
contentWidth
/
2
x
:
guidePos
<
0
?
0
:
(
guidePos
>
(
parent
.
width
-
mlabel
.
contentWidth
)
?
parent
.
width
-
mlabel
.
contentWidth
:
guidePos
)
radius
:
2
...
...
src/monitor/view/kdenliveclipmonitor.qml
View file @
09c6656a
...
...
@@ -492,7 +492,7 @@ Item {
width
:
fontMetrics
.
boundingRect
(
displayText
).
width
+
10
horizontalAlignment
:
displayText
==
text
?
TextInput
.
AlignHCenter
:
TextInput
.
AlignLeft
background
:
Rectangle
{
color
:
"
#990000ff
"
color
:
controller
.
markerColor
}
color
:
"
#ffffff
"
padding
:
0
...
...
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