feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Change-Id: I37a1f78caf9ae258c6b052efa3be15b3dbcbe164
This commit is contained in:
Eike Ziller
2022-07-12 13:56:23 +02:00
parent d1dbff3e6f 894a62325a
commit 90a03391d7
135 changed files with 676 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp
View File

@@ -35,6 +35,7 @@
#include <variantproperty.h>
#include <qmlstate.h>
#include <qmltimeline.h>
#include <nodelistproperty.h>
#include <cmath>
@@ -196,6 +197,9 @@ void CurveEditorView::propertiesRemoved([[maybe_unused]] const QList<AbstractPro
QmlTimeline CurveEditorView::activeTimeline() const
{
if (!isAttached())
return {};
QmlModelState state = currentState();
if (state.isBaseState()) {
for (const ModelNode &node : allModelNodesOfType("QtQuick.Timeline.Timeline")) {
@@ -316,42 +320,56 @@ void commitAuxiliaryData(ModelNode &node, TreeItem *item)
void CurveEditorView::commitKeyframes(TreeItem *item)
{
if (!isAttached())
return;
if (auto *nitem = item->asNodeItem()) {
ModelNode node = modelNodeForId(nitem->name());
commitAuxiliaryData(node, item);
} else if (auto *pitem = item->asPropertyItem()) {
QmlTimeline currentTimeline = activeTimeline();
if (!currentTimeline.isValid())
return;
QmlTimelineKeyframeGroup group = timelineKeyframeGroup(currentTimeline, pitem);
if (group.isValid()) {
ModelNode groupNode = group.modelNode();
commitAuxiliaryData(groupNode, item);
auto replaceKeyframes = [&group, pitem, this]() {
auto replaceKeyframes = [&group, pitem, this]() mutable {
m_block = true;
for (auto frame : group.keyframes())
for (auto& frame : group.keyframes())
frame.destroy();
Keyframe previous;
for (auto &&frame : pitem->curve().keyframes()) {
QPointF pos = frame.position();
group.setValue(QVariant(pos.y()), pos.x());
if (previous.isValid()) {
if (frame.interpolation() == Keyframe::Interpolation::Bezier ||
frame.interpolation() == Keyframe::Interpolation::Step ) {
CurveSegment segment(previous, frame);
if (segment.isValid())
attachEasingCurve(group, pos.x(), segment.easingCurve());
} else if (frame.interpolation() == Keyframe::Interpolation::Easing) {
QVariant data = frame.data();
if (data.type() == static_cast<int>(QMetaType::QEasingCurve))
attachEasingCurve(group, pos.x(), data.value<QEasingCurve>());
}
AnimationCurve curve = pitem->curve();
if (curve.valueType() == AnimationCurve::ValueType::Bool) {
for (const auto& frame : curve.keyframes()) {
QPointF pos = frame.position();
group.setValue(QVariant(pos.y()), pos.x());
}
} else {
Keyframe previous;
for (const auto& frame : curve.keyframes()) {
QPointF pos = frame.position();
group.setValue(QVariant(pos.y()), pos.x());
previous = frame;
if (previous.isValid()) {
if (frame.interpolation() == Keyframe::Interpolation::Bezier ||
frame.interpolation() == Keyframe::Interpolation::Step ) {
CurveSegment segment(previous, frame);
if (segment.isValid())
attachEasingCurve(group, pos.x(), segment.easingCurve());
} else if (frame.interpolation() == Keyframe::Interpolation::Easing) {
QVariant data = frame.data();
if (data.type() == static_cast<int>(QMetaType::QEasingCurve))
attachEasingCurve(group, pos.x(), data.value<QEasingCurve>());
}
}
previous = frame;
}
}
m_block = false;
};