Commit 2c5a80df authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '1904'

parents 235e7c5f ed107a46
......@@ -1352,9 +1352,7 @@ void KdenliveDoc::updateProjectProfile(bool reloadProducers)
return;
}
emit updateFps(fpsChanged);
if (!qFuzzyCompare(fpsChanged, 1.0)) {
pCore->bin()->reloadAllProducers();
}
pCore->bin()->reloadAllProducers();
}
void KdenliveDoc::resetProfile()
......
......@@ -260,7 +260,7 @@ Item {
Drag.active: trimInMouseArea.drag.active
Drag.proposedAction: Qt.MoveAction
enabled: !compositionRoot.grouped
visible: root.activeTool === 0 && !dragProxyArea.drag.active
visible: trimInMouseArea.pressed || (root.activeTool === 0 && !dragProxyArea.drag.active && compositionRoot.width > 4 * width)
MouseArea {
id: trimInMouseArea
......@@ -310,7 +310,7 @@ Item {
Drag.active: trimOutMouseArea.drag.active
Drag.proposedAction: Qt.MoveAction
enabled: !compositionRoot.grouped
visible: root.activeTool === 0 && !dragProxyArea.drag.active
visible: trimOutMouseArea.pressed || (root.activeTool === 0 && !dragProxyArea.drag.active && compositionRoot.width > 4 * width)
MouseArea {
id: trimOutMouseArea
......
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