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

remap: fix editing "speed before" broke, correctly clear remap widget on clip deletion

parent 8f54fb2a
...@@ -712,10 +712,11 @@ void RemapView::updateBeforeSpeed(double speed) ...@@ -712,10 +712,11 @@ void RemapView::updateBeforeSpeed(double speed)
int offset = it.value() + updatedLength - m_currentKeyframe.second; int offset = it.value() + updatedLength - m_currentKeyframe.second;
m_currentKeyframe.second = it.value() + updatedLength; m_currentKeyframe.second = it.value() + updatedLength;
m_keyframes.insert(m_currentKeyframe.first, m_currentKeyframe.second); m_keyframes.insert(m_currentKeyframe.first, m_currentKeyframe.second);
it+=2;
// Update all keyframes after that so that we don't alter the speeds // Update all keyframes after that so that we don't alter the speeds
while (m_moveNext && it != m_keyframes.end()) { while (m_moveNext && it != m_keyframes.end()) {
it++;
m_keyframes.insert(it.key(), it.value() + offset); m_keyframes.insert(it.key(), it.value() + offset);
it++;
} }
updateKeyframes(); updateKeyframes();
update(); update();
...@@ -986,7 +987,7 @@ void RemapView::paintEvent(QPaintEvent *event) ...@@ -986,7 +987,7 @@ void RemapView::paintEvent(QPaintEvent *event)
*/ */
p.setPen(m_colKeyframe); p.setPen(m_colKeyframe);
// Top timeline // Top timeline
qDebug()<<"=== MAX KFR WIDTH: "<<maxWidth<<", DURATION SCALED: "<<(m_duration * m_scale)<<", POS: "<<(m_position * m_scale); //qDebug()<<"=== MAX KFR WIDTH: "<<maxWidth<<", DURATION SCALED: "<<(m_duration * m_scale)<<", POS: "<<(m_position * m_scale);
p.drawLine(m_offset, m_lineHeight, maxWidth + m_offset, m_lineHeight); p.drawLine(m_offset, m_lineHeight, maxWidth + m_offset, m_lineHeight);
p.drawLine(m_offset, m_lineHeight - m_lineHeight / 4, m_offset, m_lineHeight + m_lineHeight / 4); p.drawLine(m_offset, m_lineHeight - m_lineHeight / 4, m_offset, m_lineHeight + m_lineHeight / 4);
p.drawLine(maxWidth + m_offset, m_lineHeight - m_lineHeight / 4, maxWidth + m_offset, m_lineHeight + m_lineHeight / 4); p.drawLine(maxWidth + m_offset, m_lineHeight - m_lineHeight / 4, maxWidth + m_offset, m_lineHeight + m_lineHeight / 4);
...@@ -1090,6 +1091,8 @@ TimeRemap::TimeRemap(QWidget *parent) ...@@ -1090,6 +1091,8 @@ TimeRemap::TimeRemap(QWidget *parent)
m_view = new RemapView(this); m_view = new RemapView(this);
time_box->setEnabled(false); time_box->setEnabled(false);
speed_box->setEnabled(false); speed_box->setEnabled(false);
speedBefore->setKeyboardTracking(false);
speedAfter->setKeyboardTracking(false);
remapLayout->addWidget(m_view); remapLayout->addWidget(m_view);
connect(m_view, &RemapView::selectedKf, [this](std::pair<int,int>selection, std::pair<double,double>speeds) { connect(m_view, &RemapView::selectedKf, [this](std::pair<int,int>selection, std::pair<double,double>speeds) {
qDebug()<<"=== SELECTED KFR SPEEDS: "<<speeds; qDebug()<<"=== SELECTED KFR SPEEDS: "<<speeds;
......
...@@ -2510,7 +2510,7 @@ bool TimelineModel::requestGroupDeletion(int clipId, Fun &undo, Fun &redo) ...@@ -2510,7 +2510,7 @@ bool TimelineModel::requestGroupDeletion(int clipId, Fun &undo, Fun &redo)
int current_group = group_queue.front(); int current_group = group_queue.front();
bool isSelection = m_currentSelection == current_group; bool isSelection = m_currentSelection == current_group;
if (isSelection) { if (isSelection) {
m_currentSelection = -1; requestClearSelection(true);
} }
group_queue.pop(); group_queue.pop();
Q_ASSERT(isGroup(current_group)); Q_ASSERT(isGroup(current_group));
......
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