Commit 0882c538 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '2004'

parents a0fe2879 fd453f88
Pipeline #19507 passed with stage
in 9 minutes and 55 seconds
......@@ -1443,16 +1443,21 @@ Rectangle {
vertical = 0
stop()
} else {
var maxScroll = trackHeaders.height - tracksArea.height + scrollView.ScrollBar.horizontal.height + ruler.height
if (scrollView.contentY > maxScroll) {
scrollView.contentY = Math.max(0, maxScroll)
if ((clipBeingMovedId == -1 && !rubberSelect.visible)) {
vertical = 0
stop()
} else {
var maxScroll = trackHeaders.height - tracksArea.height + scrollView.ScrollBar.horizontal.height + ruler.height
if (scrollView.contentY > maxScroll) {
scrollView.contentY = Math.max(0, maxScroll)
vertical = 0
stop()
}
}
}
}
if (horizontal != 0) {
if (scrollView.contentX + horizontal < 0) {
if (scrollView.contentX < -horizontal) {
horizontal = - scrollView.contentX
scrollView.contentX = 0
} else {
......@@ -1462,14 +1467,16 @@ Rectangle {
dragProxy.x += horizontal
dragProxyArea.moveItem()
}
if (scrollView.contentX == 0 || clipBeingMovedId == -1) {
if (scrollView.contentX == 0 || (clipBeingMovedId == -1 && !rubberSelect.visible)) {
horizontal = 0
stop()
}
}
if (rubberSelect.visible) {
rubberSelect.x -= horizontal
rubberSelect.width += horizontal
rubberSelect.y -= vertical
rubberSelect.height += vertical
}
}
}
......
......@@ -2647,7 +2647,8 @@ void TimelineController::updateClipActions()
} else if (actionData == QLatin1Char('C') && clip == nullptr) {
enableAction = false;
} else if (actionData == QLatin1Char('P')) {
enableAction = enablePositionActions;
// Position actions should stay enabled in clip monitor
//enableAction = enablePositionActions;
}
act->setEnabled(enableAction);
}
......
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