Fix various keyframe related issues.

Related to #218
parent ba15c389
Pipeline #4003 passed with stage
in 25 minutes and 4 seconds
......@@ -6,16 +6,16 @@
<parameter type="simplekeyframe" name="transition.rotate_x" max="1800" min="-1800" default="0" factor="10">
<name>Rotate X</name>
</parameter>
<parameter type="simplekeyframe" name="transition.rotate_y" max="1800" min="-1800" default="0" factor="10">
<parameter type="simplekeyframe" name="transition.rotate_y" max="1800" min="-1800" default="0" factor="10" notintimeline="1">
<name>Rotate Y</name>
</parameter>
<parameter type="simplekeyframe" name="transition.rotate_z" max="1800" min="-1800" default="0" factor="10">
<parameter type="simplekeyframe" name="transition.rotate_z" max="1800" min="-1800" default="0" factor="10" notintimeline="1">
<name>Rotate Z</name>
</parameter>
<parameter type="simplekeyframe" name="transition.ox" max="32000" min="-32000" default="0">
<parameter type="simplekeyframe" name="transition.ox" max="32000" min="-32000" default="0" notintimeline="1">
<name>Offset X</name>
</parameter>
<parameter type="simplekeyframe" name="transition.oy" max="32000" min="-32000" default="0">
<parameter type="simplekeyframe" name="transition.oy" max="32000" min="-32000" default="0" notintimeline="1">
<name>Offset Y</name>
</parameter>
<parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">
......
......@@ -477,7 +477,7 @@ void KeyframeWidget::slotImportKeyframes()
return;
}
import->importSelectedData();
/*m_model->getKeyframeModel()->getKeyModel()->dataChanged(QModelIndex(), QModelIndex());*/
/*m_model->modelChanged();
qDebug()<<"//// UPDATING KEYFRAMES CORE---------";
......@@ -487,5 +487,6 @@ void KeyframeWidget::slotImportKeyframes()
void KeyframeWidget::slotRemoveNextKeyframes()
{
m_keyframes->removeNextKeyframes(GenTime(m_time->getValue(), pCore->getCurrentFps()));
int pos = m_time->getValue() + m_model->data(m_index, AssetParameterModel::ParentInRole).toInt();
m_keyframes->removeNextKeyframes(GenTime(pos, pCore->getCurrentFps()));
}
......@@ -331,7 +331,10 @@ void CollapsibleEffectView::slotActivateEffect(QModelIndex ix)
void CollapsibleEffectView::mousePressEvent(QMouseEvent *e)
{
m_dragStart = e->globalPos();
emit activateEffect(m_model);
if (!decoframe->property("active").toBool()) {
// Activate effect if not already active
emit activateEffect(m_model);
}
QWidget::mousePressEvent(e);
}
......
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