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

Correctly initialize timeline snapping

parent d906769b
...@@ -285,7 +285,7 @@ Rectangle { ...@@ -285,7 +285,7 @@ Rectangle {
property int spacerFrame: -1 property int spacerFrame: -1
property int spacerClickFrame: -1 property int spacerClickFrame: -1
property real timeScale: timeline.scaleFactor property real timeScale: timeline.scaleFactor
property int snapping: (timeline.snap && (timeScale < 2 * baseUnit)) ? Math.floor(baseUnit / (timeScale > 3 ? timeScale / 2 : timeScale)) : -1 property int snapping: (timeline.snap && (timeline.scaleFactor < 2 * baseUnit)) ? Math.floor(baseUnit / (timeline.scaleFactor > 3 ? timeline.scaleFactor / 2 : timeline.scaleFactor)) : -1
property var timelineSelection: timeline.selection property var timelineSelection: timeline.selection
property int trackHeight property int trackHeight
property int copiedClip: -1 property int copiedClip: -1
......
...@@ -2704,7 +2704,6 @@ void TimelineController::updateClipActions() ...@@ -2704,7 +2704,6 @@ void TimelineController::updateClipActions()
if (m_model->isClip(item)) { if (m_model->isClip(item)) {
clip = m_model->getClipPtr(item); clip = m_model->getClipPtr(item);
} }
bool enablePositionActions = positionIsInItem(item);
for (QAction *act : clipActions) { for (QAction *act : clipActions) {
bool enableAction = true; bool enableAction = true;
const QChar actionData = act->data().toChar(); const QChar actionData = act->data().toChar();
......
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