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

Move keyframes horizontally when shift is pressed

Browse Source 
It is now possible to move keyframes in the curve editor
in the x direction only by pressing shift while dragging.

Fixes: QDS-6952
Change-Id: Ic1a25ec6d8dec82cf5599dccbaeff7e5f34d2936
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Knud Dollereder
2022-08-03 13:19:05 +02:00
parent 675e63e658
commit fea338c000
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.cpp
View File

@@ -27,7 +27,10 @@
#include "curveitem.h" #include "curveitem.h"
#include "handleitem.h" #include "handleitem.h"
#include <QApplication>
#include <QPainter> #include <QPainter>
#include <qnamespace.h>
#include <QGraphicsSceneMouseEvent>
#include <cmath> #include <cmath>
@@ -453,10 +456,22 @@ QVariant KeyframeItem::itemChange(QGraphicsItem::GraphicsItemChange change, cons
lseg.moveRightTo(position); lseg.moveRightTo(position);
rseg.moveLeftTo(position); rseg.moveLeftTo(position);
if (legalLeft() && legalRight()) if (legalLeft() && legalRight()) {
m_validPos = position; if (qApp->keyboardModifiers().testFlag(Qt::ShiftModifier) && m_validPos.has_value()) {
if (m_firstPos) {
auto firstToNow = QLineF(*m_firstPos, position);
if (std::abs(firstToNow.dx()) > std::abs(firstToNow.dy()))
m_validPos = QPointF(position.x(), m_firstPos->y());
else
m_validPos = QPointF(m_firstPos->x(), position.y());
}
return QVariant(m_transform.map(m_validPos)); } else {
m_validPos = position;
}
}
return QVariant(m_transform.map(*m_validPos));
} }
} }
} }
@@ -466,6 +481,11 @@ QVariant KeyframeItem::itemChange(QGraphicsItem::GraphicsItemChange change, cons
void KeyframeItem::mousePressEvent(QGraphicsSceneMouseEvent *event) void KeyframeItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
{ {
bool ok;
m_firstPos = m_transform.inverted(&ok).map(event->scenePos());
if (!ok)
m_firstPos = Utils::nullopt;
SelectableItem::mousePressEvent(event); SelectableItem::mousePressEvent(event);
if (auto *curveItem = qgraphicsitem_cast<CurveItem *>(parentItem())) if (auto *curveItem = qgraphicsitem_cast<CurveItem *>(parentItem()))
curveItem->setHandleVisibility(false); curveItem->setHandleVisibility(false);
@@ -473,6 +493,7 @@ void KeyframeItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
void KeyframeItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void KeyframeItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
{ {
m_firstPos = Utils::nullopt;
SelectableItem::mouseReleaseEvent(event); SelectableItem::mouseReleaseEvent(event);
if (auto *curveItem = qgraphicsitem_cast<CurveItem *>(parentItem())) if (auto *curveItem = qgraphicsitem_cast<CurveItem *>(parentItem()))
curveItem->setHandleVisibility(true); curveItem->setHandleVisibility(true);

5
src/plugins/qmldesigner/components/curveeditor/detail/keyframeitem.h
View File

@@ -30,6 +30,8 @@
#include "keyframe.h" #include "keyframe.h"
#include "selectableitem.h" #include "selectableitem.h"
#include <utils/optional.h>
#include <QGraphicsObject> #include <QGraphicsObject>
namespace QmlDesigner { namespace QmlDesigner {
@@ -133,7 +135,8 @@ private:
HandleItem *m_right; HandleItem *m_right;
QPointF m_validPos; Utils::optional< QPointF > m_firstPos;
Utils::optional< QPointF > m_validPos;
bool m_visibleOverride = true; bool m_visibleOverride = true;