diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index 7dd647c6..6efd102d 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1711,10 +1711,19 @@ UBGraphicsAudioItem* UBBoardController::addAudio(const QUrl& pSourceUrl, bool st void UBBoardController::cut() { - QList selected; + //---------------------------------------------------------// + QList selectedItems; foreach(QGraphicsItem* gi, mActiveScene->selectedItems()) + selectedItems << gi; + + //---------------------------------------------------------// + + QList selected; + foreach(QGraphicsItem* gi, selectedItems) { + gi->setSelected(false); + UBItem* ubItem = dynamic_cast(gi); UBGraphicsItem *ubGi = dynamic_cast(gi); @@ -1725,6 +1734,8 @@ void UBBoardController::cut() } } + //---------------------------------------------------------// + if (selected.size() > 0) { QClipboard *clipboard = QApplication::clipboard(); @@ -1736,6 +1747,8 @@ void UBBoardController::cut() mActiveDocument->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); } + + //---------------------------------------------------------// } diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index d0c63650..7031493c 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -267,7 +267,6 @@ void UBGraphicsItemDelegate::positionHandles() void UBGraphicsItemDelegate::remove(bool canUndo) { QGraphicsScene* scene = mDelegated->scene(); - if (scene) { foreach(DelegateButton* button, mButtons) @@ -278,9 +277,7 @@ void UBGraphicsItemDelegate::remove(bool canUndo) if (canUndo) { - UBGraphicsItemUndoCommand *uc = - new UBGraphicsItemUndoCommand((UBGraphicsScene*) scene, mDelegated, 0); - + UBGraphicsItemUndoCommand *uc = new UBGraphicsItemUndoCommand((UBGraphicsScene*) scene, mDelegated, 0); UBApplication::undoStack->push(uc); } }