Fix up label setting

4 files changed, 12 insertions, 13 deletions

diff --git a/sigmodr/widgets/EffectItem.cpp b/sigmodr/widgets/EffectItem.cpp
index 04b1d963..49d21386 100644
--- a/sigmodr/widgets/EffectItem.cpp
+++ b/sigmodr/widgets/EffectItem.cpp
@@ -34,13 +34,13 @@ EffectItem::EffectItem(MapEffect* effect, QGraphicsScene* parent) :
         m_effect(effect)
 {
     connect(m_effect, SIGNAL(changed()), this, SLOT(effectChanged()));
-    effectChanged();
+    setOpacity(.5);
     setZValue(INT_MAX);
     QGraphicsSimpleTextItem* item = new QGraphicsSimpleTextItem(QString::number(m_effect->id()), this);
     QSizeF size = item->boundingRect().size() / 2;
     item->setPos(-size.width(), -size.height());
-    m_label = new QGraphicsSimpleTextItem(m_effect->name(), this);
-    resetLabel();
+    m_label = new QGraphicsSimpleTextItem(this);
+    effectChanged();
 }
 
 QRectF EffectItem::boundingRect() const
@@ -89,13 +89,13 @@ void EffectItem::resizeBy(const QPointF& size)
 void EffectItem::effectChanged()
 {
     setPos(m_effect->area().topLeft());
-    m_label->setText(m_effect->name());
     resetLabel();
     update();
 }
 
 void EffectItem::resetLabel()
 {
+    m_label->setText(m_effect->name());
     QSizeF size = m_label->boundingRect().size() / 2 - m_effect->area().size() / 2;
     m_label->setPos(-size.width(), -size.height());
 }
diff --git a/sigmodr/widgets/TileItem.cpp b/sigmodr/widgets/TileItem.cpp
index cb65ef1f..34ccc3c4 100644
--- a/sigmodr/widgets/TileItem.cpp
+++ b/sigmodr/widgets/TileItem.cpp
@@ -38,13 +38,12 @@ TileItem::TileItem(MapTile* tile, QGraphicsScene* parent) :
         m_tileIndex(-1)
 {
     connect(m_tile, SIGNAL(changed()), this, SLOT(tileChanged()));
-    tileChanged();
     setZValue(m_tile->zIndex());
     QGraphicsSimpleTextItem* item = new QGraphicsSimpleTextItem(QString::number(m_tile->id()), this);
     QSizeF size = item->boundingRect().size() / 2;
     item->setPos(-size.width(), -size.height());
     m_label = new QGraphicsSimpleTextItem(this);
-    resetLabel();
+    tileChanged();
 }
 
 QRectF TileItem::boundingRect() const
@@ -106,7 +105,9 @@ void TileItem::resetLabel()
 {
     const Tile* tile = m_tile->game()->tileById(m_tile->tile());
     if (tile)
+    {
         m_label->setText(tile->name());
-    QSizeF size = m_label->boundingRect().size() / 2 - m_pixmap.size() / 2;
-    m_label->setPos(-size.width(), -size.height());
+        QSizeF size = m_label->boundingRect().size() / 2 - m_pixmap.size() / 2;
+        m_label->setPos(-size.width(), -size.height());
+    }
 }
diff --git a/sigmodr/widgets/TrainerItem.cpp b/sigmodr/widgets/TrainerItem.cpp
index 0bf12784..acbc1d8f 100644
--- a/sigmodr/widgets/TrainerItem.cpp
+++ b/sigmodr/widgets/TrainerItem.cpp
@@ -34,13 +34,12 @@ TrainerItem::TrainerItem(MapTrainer* trainer, QGraphicsScene* parent) :
         m_trainer(trainer)
 {
     connect(m_trainer, SIGNAL(changed()), this, SLOT(trainerChanged()));
-    trainerChanged();
     setZValue(INT_MAX);
     QGraphicsSimpleTextItem* item = new QGraphicsSimpleTextItem(QString::number(m_trainer->id()), this);
     QSizeF size = item->boundingRect().size() / 2;
     item->setPos(-size.width(), -size.height());
-    m_label = new QGraphicsSimpleTextItem(m_trainer->name(), this);
-    resetLabel();
+    m_label = new QGraphicsSimpleTextItem(this);
+    trainerChanged();
 }
 
 QRectF TrainerItem::boundingRect() const
diff --git a/sigmodr/widgets/WarpItem.cpp b/sigmodr/widgets/WarpItem.cpp
index 013be6a7..816341de 100644
--- a/sigmodr/widgets/WarpItem.cpp
+++ b/sigmodr/widgets/WarpItem.cpp
@@ -34,13 +34,12 @@ WarpItem::WarpItem(MapWarp* warp, QGraphicsScene* parent) :
         m_warp(warp)
 {
     connect(m_warp, SIGNAL(changed()), this, SLOT(warpChanged()));
-    warpChanged();
     setZValue(INT_MAX);
     QGraphicsSimpleTextItem* item = new QGraphicsSimpleTextItem(QString::number(m_warp->id()), this);
     QSizeF size = item->boundingRect().size() / 2;
     item->setPos(-size.width(), -size.height());
     m_label = new QGraphicsSimpleTextItem(this);
-    resetLabel();
+    warpChanged();
 }
 
 QRectF WarpItem::boundingRect() const