aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Animate piece transformation with stickying animation.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-04-08 18:58:23 +03:00
parent 9e3659830e
commit c5a3375d78
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/puzzle/vpmainwindow.cpp
View File

@ -3479,8 +3479,7 @@ void VPMainWindow::TranslatePieceRelatively(const VPPiecePtr &piece, const QRect
pieceDy += dy * ((pieceRect.topLeft().y() - rect.topLeft().y()) / rect.height()) * 2.; pieceDy += dy * ((pieceRect.topLeft().y() - rect.topLeft().y()) / rect.height()) * 2.;
} }
auto *command = new VPUndoPieceMove(piece, pieceDx, pieceDy); m_layout->UndoStack()->push(new VPUndoPieceMove(piece, pieceDx, pieceDy));
m_layout->UndoStack()->push(command);
if (m_layout->LayoutSettings().IsStickyEdges()) if (m_layout->LayoutSettings().IsStickyEdges())
{ {
@ -3488,9 +3487,14 @@ void VPMainWindow::TranslatePieceRelatively(const VPPiecePtr &piece, const QRect
qreal stickyTranslateY = 0; qreal stickyTranslateY = 0;
if (piece->StickyPosition(stickyTranslateX, stickyTranslateY)) if (piece->StickyPosition(stickyTranslateX, stickyTranslateY))
{ {
QTime const dieTime = QTime::currentTime().addMSecs(150);
while (QTime::currentTime() < dieTime)
{
QCoreApplication::processEvents(QEventLoop::AllEvents, 50);
}
bool const allowMerge = selectedPiecesCount == 1; bool const allowMerge = selectedPiecesCount == 1;
auto *stickyCommand = new VPUndoPieceMove(piece, stickyTranslateX, stickyTranslateY, allowMerge); m_layout->UndoStack()->push(new VPUndoPieceMove(piece, stickyTranslateX, stickyTranslateY, allowMerge));
m_layout->UndoStack()->push(stickyCommand);
} }
} }
} }
@ -3525,8 +3529,7 @@ void VPMainWindow::RotatePieces()
origin.origin = rect.center(); origin.origin = rect.center();
origin.custom = true; origin.custom = true;
auto *command = new VPUndoPieceRotate(piece, origin, angle, angle); m_layout->UndoStack()->push(new VPUndoPieceRotate(piece, origin, angle, angle));
m_layout->UndoStack()->push(command);
} }
} }
m_layout->UndoStack()->endMacro(); m_layout->UndoStack()->endMacro();