From e79ed88589f07876959e1a6f31be190d3786d061 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Wed, 23 May 2012 12:41:19 +0300 Subject: [PATCH] Locked media items is not movable now. Locked items cannot be moved horizontally by its frame. Text items can be resized correctly now. --- src/domain/UBGraphicsDelegateFrame.cpp | 6 +++--- src/domain/UBGraphicsMediaItem.cpp | 11 +++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp index f5ad3016..3270abf9 100644 --- a/src/domain/UBGraphicsDelegateFrame.cpp +++ b/src/domain/UBGraphicsDelegateFrame.cpp @@ -249,6 +249,9 @@ bool UBGraphicsDelegateFrame::canResizeBottomRight(qreal width, qreal height, qr void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { + if (mDelegate->delegated()->data(UBGraphicsItemData::ItemLocked).toBool()) + return; + QLineF move(mStartingPoint, event->scenePos()); qreal moveX = move.length() * cos((move.angle() - mAngle) * PI / 180); qreal moveY = -move.length() * sin((move.angle() - mAngle) * PI / 180); @@ -390,9 +393,6 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event) QSizeF newSize = resizableItem->size() + incVector; - if (!(mDelegate->getToolBarItem()->isVisibleOnBoard() - && (newSize.width() < mDelegate->getToolBarItem()->minWidth() / mDelegate->antiScaleRatio() - || newSize.height() < mDelegate->getToolBarItem()->minWidth() / mDelegate->antiScaleRatio() * 3/4))) resizableItem->resize(newSize); } } diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp index 8a25a217..08c8bd52 100644 --- a/src/domain/UBGraphicsMediaItem.cpp +++ b/src/domain/UBGraphicsMediaItem.cpp @@ -223,14 +223,6 @@ UBItem* UBGraphicsMediaItem::deepCopy() const void UBGraphicsMediaItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { -// QDrag* mDrag = new QDrag(event->widget()); -// QMimeData* pMime = new QMimeData(); -// mDrag->setMimeData(pMime); -// mDrag->start(); - -// UBApplication::boardController->activeScene()->setActiveItem(this); - - if (mDelegate) { mDelegate->mousePressEvent(event); @@ -279,6 +271,9 @@ void UBGraphicsMediaItem::mousePressEvent(QGraphicsSceneMouseEvent *event) void UBGraphicsMediaItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { + if (data(UBGraphicsItemData::ItemLocked).toBool()) + return; + if(mShouldMove && (event->buttons() & Qt::LeftButton)) { QPointF offset = event->scenePos() - mMousePressPos;