Merge branch 'Sankore-1.40' of github.com:Sankore/Sankore-3.1 into Sankore-1.40

preferencesAboutTextFull
Claudio Valerio 13 years ago
commit 346b693c58
  1. 1
      src/board/UBBoardView.cpp
  2. 3
      src/domain/UBGraphicsVideoItem.cpp

@ -426,6 +426,7 @@ UBBoardView::mousePressEvent (QMouseEvent *event)
if (!movingItem if (!movingItem
|| movingItem->isSelected() || movingItem->isSelected()
|| movingItem->data(UBGraphicsItemData::ItemLocked).toBool()
|| movingItem->type() == UBGraphicsDelegateFrame::Type || movingItem->type() == UBGraphicsDelegateFrame::Type
|| movingItem->type() == DelegateButton::Type || movingItem->type() == DelegateButton::Type
|| movingItem->type() == UBGraphicsCompass::Type || movingItem->type() == UBGraphicsCompass::Type

@ -120,6 +120,9 @@ void UBGraphicsVideoItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
void UBGraphicsVideoItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void UBGraphicsVideoItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{ {
if (mDelegate->delegated()->data(UBGraphicsItemData::ItemLocked).toBool())
return;
if(mShouldMove && (event->buttons() & Qt::LeftButton)) if(mShouldMove && (event->buttons() & Qt::LeftButton))
{ {
QPointF offset = event->scenePos() - mMousePressPos; QPointF offset = event->scenePos() - mMousePressPos;

Loading…
Cancel
Save