Moved mediaItem Delegate initialization to the mediaItem subclasses

That function requires access to variables that are initialized
in videoItem and audioItem constructors, so it can sometimes fail
when called from the superclass's constructor.
It might be an idea to avoid those calls altogether though
preferencesAboutTextFull
Craig Watson 9 years ago
parent ff5c95dde2
commit c8b57dbd0b
  1. 9
      src/domain/UBGraphicsMediaItem.cpp

@ -74,7 +74,6 @@ UBGraphicsMediaItem::UBGraphicsMediaItem(const QUrl& pMediaFileUrl, QGraphicsIte
mMediaObject->setMedia(pMediaFileUrl); mMediaObject->setMedia(pMediaFileUrl);
setDelegate(new UBGraphicsMediaItemDelegate(this)); setDelegate(new UBGraphicsMediaItemDelegate(this));
Delegate()->createControls();
setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem));
setFlag(ItemIsMovable, true); setFlag(ItemIsMovable, true);
@ -105,19 +104,24 @@ UBGraphicsMediaItem::UBGraphicsMediaItem(const QUrl& pMediaFileUrl, QGraphicsIte
UBGraphicsAudioItem::UBGraphicsAudioItem(const QUrl &pMediaFileUrl, QGraphicsItem *parent) UBGraphicsAudioItem::UBGraphicsAudioItem(const QUrl &pMediaFileUrl, QGraphicsItem *parent)
:UBGraphicsMediaItem(pMediaFileUrl, parent) :UBGraphicsMediaItem(pMediaFileUrl, parent)
{ {
haveLinkedImage = false;
this->setSize(320, 26); this->setSize(320, 26);
this->setMinimumSize(QSize(150, 26)); this->setMinimumSize(QSize(150, 26));
Delegate()->createControls();
Delegate()->frame()->setOperationMode(UBGraphicsDelegateFrame::ResizingHorizontally); Delegate()->frame()->setOperationMode(UBGraphicsDelegateFrame::ResizingHorizontally);
mMediaObject->setNotifyInterval(1000); mMediaObject->setNotifyInterval(1000);
haveLinkedImage = false;
} }
UBGraphicsVideoItem::UBGraphicsVideoItem(const QUrl &pMediaFileUrl, QGraphicsItem *parent) UBGraphicsVideoItem::UBGraphicsVideoItem(const QUrl &pMediaFileUrl, QGraphicsItem *parent)
:UBGraphicsMediaItem(pMediaFileUrl, parent) :UBGraphicsMediaItem(pMediaFileUrl, parent)
{ {
haveLinkedImage = true;
Delegate()->createControls();
mVideoItem = new QGraphicsVideoItem(this); mVideoItem = new QGraphicsVideoItem(this);
mVideoItem->setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object); mVideoItem->setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object);
@ -132,7 +136,6 @@ UBGraphicsVideoItem::UBGraphicsVideoItem(const QUrl &pMediaFileUrl, QGraphicsIte
connect(mVideoItem, SIGNAL(nativeSizeChanged(QSizeF)), connect(mVideoItem, SIGNAL(nativeSizeChanged(QSizeF)),
this, SLOT(videoSizeChanged(QSizeF))); this, SLOT(videoSizeChanged(QSizeF)));
haveLinkedImage = true;
setAcceptHoverEvents(true); setAcceptHoverEvents(true);

Loading…
Cancel
Save