Commit c055ffa7 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Move remap marker before clip name, fix qml warning

parent 71ba58f4
...@@ -779,6 +779,7 @@ Rectangle { ...@@ -779,6 +779,7 @@ Rectangle {
// Clipping container for clip names // Clipping container for clip names
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: mixContainer.width anchors.leftMargin: mixContainer.width
id: nameContainer
clip: true clip: true
Rectangle { Rectangle {
// Clip name background // Clip name background
...@@ -788,7 +789,7 @@ Rectangle { ...@@ -788,7 +789,7 @@ Rectangle {
height: label.height height: label.height
visible: clipRoot.width > width / 2 visible: clipRoot.width > width / 2
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: clipRoot.timeremap ? labelRect.width : 0 anchors.leftMargin: clipRoot.timeremap ? labelRect.height : 0
Text { Text {
// Clip name text // Clip name text
id: label id: label
...@@ -879,7 +880,7 @@ Rectangle { ...@@ -879,7 +880,7 @@ Rectangle {
width: labelRect.height width: labelRect.height
height: labelRect.height height: labelRect.height
anchors.top: labelRect.top anchors.top: labelRect.top
anchors.left: nameContainer.left anchors.left: labelRect.right
visible: !clipRoot.isAudio && clipRoot.clipStatus === ClipStatus.StatusProxy || clipRoot.clipStatus === ClipStatus.StatusProxyOnly visible: !clipRoot.isAudio && clipRoot.clipStatus === ClipStatus.StatusProxy || clipRoot.clipStatus === ClipStatus.StatusProxyOnly
Text { Text {
// Proxy P // Proxy P
...@@ -898,13 +899,13 @@ Rectangle { ...@@ -898,13 +899,13 @@ Rectangle {
} }
} }
Rectangle{ Rectangle{
//proxy //remap
id:remapRect id:remapRect
color: '#cc0033' color: '#cc0033'
width: labelRect.height width: labelRect.height
height: labelRect.height height: labelRect.height
anchors.top: labelRect.top anchors.top: labelRect.top
anchors.left: proxyRect.visible ? proxyRect.right : labelRect.right anchors.left: nameContainer.left
visible: clipRoot.timeremap visible: clipRoot.timeremap
Text { Text {
// Remap R // Remap R
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment