Fixed saving of all graphicsItems' zValues

Simply added copying of zValue to the deep copy functions. As tested on
OSX, this does pose any problems when duplicating an item on-page (i.e
generating a new item with a zValue equal to its original).
preferencesAboutTextFull
Craig Watson 9 years ago
parent 4d74341c68
commit 6752201154
  1. 2
      src/domain/UBGraphicsMediaItem.cpp
  2. 1
      src/domain/UBGraphicsPDFItem.cpp
  3. 2
      src/domain/UBGraphicsPixmapItem.cpp
  4. 1
      src/domain/UBGraphicsSvgItem.cpp
  5. 1
      src/domain/UBGraphicsTextItem.cpp
  6. 1
      src/domain/UBGraphicsWidgetItem.cpp

@ -275,6 +275,8 @@ void UBGraphicsMediaItem::copyItemParameters(UBItem *copy) const
cp->setSourceUrl(this->sourceUrl()); cp->setSourceUrl(this->sourceUrl());
cp->resize(this->size()); cp->resize(this->size());
cp->setZValue(this->zValue());
connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), cp, SLOT(activeSceneChanged())); connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), cp, SLOT(activeSceneChanged()));
// TODO UB 4.7 complete all members // TODO UB 4.7 complete all members
} }

@ -122,6 +122,7 @@ void UBGraphicsPDFItem::copyItemParameters(UBItem *copy) const
cp->setFlag(QGraphicsItem::ItemIsSelectable, true); cp->setFlag(QGraphicsItem::ItemIsSelectable, true);
cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType)); cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
cp->setSourceUrl(this->sourceUrl()); cp->setSourceUrl(this->sourceUrl());
cp->setZValue(this->zValue());
} }
} }

@ -156,6 +156,8 @@ void UBGraphicsPixmapItem::copyItemParameters(UBItem *copy) const
cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType)); cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked)); cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
cp->setSourceUrl(this->sourceUrl()); cp->setSourceUrl(this->sourceUrl());
cp->setZValue(this->zValue());
} }
} }

@ -180,6 +180,7 @@ void UBGraphicsSvgItem::copyItemParameters(UBItem *copy) const
cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType)); cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked)); cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
cp->setSourceUrl(this->sourceUrl()); cp->setSourceUrl(this->sourceUrl());
cp->setZValue(this->zValue());
} }
} }

@ -280,6 +280,7 @@ void UBGraphicsTextItem::copyItemParameters(UBItem *copy) const
cp->setTextHeight(this->textHeight()); cp->setTextHeight(this->textHeight());
cp->setSourceUrl(this->sourceUrl()); cp->setSourceUrl(this->sourceUrl());
cp->setZValue(this->zValue());
} }
} }

@ -744,6 +744,7 @@ void UBGraphicsAppleWidgetItem::copyItemParameters(UBItem *copy) const
} }
cp->setSourceUrl(this->sourceUrl()); cp->setSourceUrl(this->sourceUrl());
cp->setZValue(this->zValue());
} }
} }

Loading…
Cancel
Save