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

Merge branch '2008'

parents 1301d057 dcb18495
Pipeline #27381 passed with stage
in 25 minutes and 49 seconds
...@@ -74,7 +74,9 @@ Rectangle { ...@@ -74,7 +74,9 @@ Rectangle {
} }
MouseArea { MouseArea {
id: headerMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton acceptedButtons: Qt.LeftButton | Qt.RightButton
onPressed: { onPressed: {
timeline.activeTrack = trackId timeline.activeTrack = trackId
...@@ -493,6 +495,7 @@ Rectangle { ...@@ -493,6 +495,7 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
propagateComposedEvents: true propagateComposedEvents: true
cursorShape: Qt.IBeamCursor
onDoubleClicked: { onDoubleClicked: {
nameEdit.visible = true nameEdit.visible = true
nameEdit.focus = true nameEdit.focus = true
...@@ -503,16 +506,6 @@ Rectangle { ...@@ -503,16 +506,6 @@ Rectangle {
timeline.activeTrack = trackId timeline.activeTrack = trackId
trackHeadRoot.focus = true trackHeadRoot.focus = true
} }
onEntered: {
if (nameEdit.visible == false && trackName == '') {
placeHolder.visible = true
}
}
onExited: {
if (placeHolder.visible == true) {
placeHolder.visible = false
}
}
} }
Label { Label {
text: trackName text: trackName
...@@ -524,7 +517,7 @@ Rectangle { ...@@ -524,7 +517,7 @@ Rectangle {
} }
Label { Label {
id: placeHolder id: placeHolder
visible: false visible: trackName == '' && (trackNameMouseArea.containsMouse || headerMouseArea.containsMouse)
enabled: false enabled: false
text: i18n("Edit track name") text: i18n("Edit track name")
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
......
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