Nothing is resizable anymore

8 files changed, 8 insertions, 43 deletions

diff --git a/sigmodr/widgets/EffectItem.cpp b/sigmodr/widgets/EffectItem.cpp
index e33fd820..8f3049af 100644
--- a/sigmodr/widgets/EffectItem.cpp
+++ b/sigmodr/widgets/EffectItem.cpp
@@ -30,7 +30,7 @@ using namespace Sigmod;
 using namespace Sigmodr::Widgets;
 
 EffectItem::EffectItem(MapEffect* effect, QGraphicsScene* parent) :
-        MapItem(true, parent),
+        MapItem(parent),
         m_effect(effect)
 {
     connect(m_effect, SIGNAL(changed()), this, SLOT(effectChanged()));
@@ -53,14 +53,6 @@ void EffectItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option
     MapItem::paint(painter, option, widget);
 }
 
-void EffectItem::resizeBy(const QPointF& size)
-{
-    QRect area = m_effect->area();
-    area.setBottomRight(area.bottomRight() + size.toPoint());
-    m_effect->setArea(area);
-    MapItem::resizeBy(size);
-}
-
 void EffectItem::moveTo(const QPoint& point)
 {
     QRect area = m_effect->area();
diff --git a/sigmodr/widgets/EffectItem.h b/sigmodr/widgets/EffectItem.h
index 14228908..578f9c6a 100644
--- a/sigmodr/widgets/EffectItem.h
+++ b/sigmodr/widgets/EffectItem.h
@@ -42,7 +42,6 @@ class SIGMODRWIDGETS_NO_EXPORT EffectItem : public MapItem
         
         void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
     protected:
-        void resizeBy(const QPointF& size);
         void moveTo(const QPoint& point);
     protected slots:
         void effectChanged();
diff --git a/sigmodr/widgets/MapItem.cpp b/sigmodr/widgets/MapItem.cpp
index 4dcc7aa8..e79891f4 100644
--- a/sigmodr/widgets/MapItem.cpp
+++ b/sigmodr/widgets/MapItem.cpp
@@ -30,9 +30,8 @@
 
 using namespace Sigmodr::Widgets;
 
-MapItem::MapItem(const bool resizable, QGraphicsScene* parent) :
+MapItem::MapItem(QGraphicsScene* parent) :
         QObject(parent),
-        m_resizable(resizable),
         m_tag(new QGraphicsSimpleTextItem(this)),
         m_label(new QGraphicsSimpleTextItem(this))
 {
@@ -45,10 +44,6 @@ MapItem::MapItem(const bool resizable, QGraphicsScene* parent) :
 void MapItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
 {
     Q_UNUSED(widget)
-    if (m_resizable && (option->state & QStyle::State_MouseOver))
-    {
-        // TODO: Draw handle for resizing
-    }
     if (option->state & QStyle::State_MouseOver)
     {
         painter->setPen(QPen(KStatefulBrush(KColorScheme::Selection, KColorScheme::HoverColor).brush(QPalette::Active), 3));
@@ -77,17 +72,7 @@ void MapItem::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
 
 void MapItem::mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 {
-    if (m_resizable && (event->modifiers() & Qt::ControlModifier))
-        resizeBy(event->pos() - event->lastPos());
-    else
-    {
-        QGraphicsItem::mouseMoveEvent(event);
-        moveTo(scenePos().toPoint());
-    }
+    QGraphicsItem::mouseMoveEvent(event);
+    moveTo(scenePos().toPoint());
     update();
 }
-
-void MapItem::resizeBy(const QPointF& size)
-{
-    Q_UNUSED(size)
-}
diff --git a/sigmodr/widgets/MapItem.h b/sigmodr/widgets/MapItem.h
index 537d66dd..6e37d89b 100644
--- a/sigmodr/widgets/MapItem.h
+++ b/sigmodr/widgets/MapItem.h
@@ -37,7 +37,7 @@ class SIGMODRWIDGETS_NO_EXPORT MapItem : public QObject, public QGraphicsItem
     Q_OBJECT
     
     public:
-        MapItem(const bool resizable, QGraphicsScene* parent);
+        MapItem(QGraphicsScene* parent);
         
         virtual QRectF boundingRect() const = 0;
         
@@ -49,12 +49,10 @@ class SIGMODRWIDGETS_NO_EXPORT MapItem : public QObject, public QGraphicsItem
         virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event);
         virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event);
         
-        virtual void resizeBy(const QPointF& size);
         virtual void moveTo(const QPoint& point) = 0;
         
         virtual void resetLabel() = 0;
         
-        const bool m_resizable;
         QGraphicsSimpleTextItem* m_tag;
         QGraphicsSimpleTextItem* m_label;
 };
diff --git a/sigmodr/widgets/TileItem.cpp b/sigmodr/widgets/TileItem.cpp
index 03962f1e..4dfd98d6 100644
--- a/sigmodr/widgets/TileItem.cpp
+++ b/sigmodr/widgets/TileItem.cpp
@@ -33,7 +33,7 @@ using namespace Sigmod;
 using namespace Sigmodr::Widgets;
 
 TileItem::TileItem(MapTile* tile, QGraphicsScene* parent) :
-        MapItem(false, parent),
+        MapItem(parent),
         m_tile(tile),
         m_tileIndex(-1)
 {
diff --git a/sigmodr/widgets/TrainerItem.cpp b/sigmodr/widgets/TrainerItem.cpp
index 824aba1f..fed797c8 100644
--- a/sigmodr/widgets/TrainerItem.cpp
+++ b/sigmodr/widgets/TrainerItem.cpp
@@ -30,7 +30,7 @@ using namespace Sigmod;
 using namespace Sigmodr::Widgets;
 
 TrainerItem::TrainerItem(MapTrainer* trainer, QGraphicsScene* parent) :
-        MapItem(false, parent),
+        MapItem(parent),
         m_trainer(trainer)
 {
     connect(m_trainer, SIGNAL(changed()), this, SLOT(trainerChanged()));
diff --git a/sigmodr/widgets/WarpItem.cpp b/sigmodr/widgets/WarpItem.cpp
index 5ca11d3e..88278e73 100644
--- a/sigmodr/widgets/WarpItem.cpp
+++ b/sigmodr/widgets/WarpItem.cpp
@@ -30,7 +30,7 @@ using namespace Sigmod;
 using namespace Sigmodr::Widgets;
 
 WarpItem::WarpItem(MapWarp* warp, QGraphicsScene* parent) :
-        MapItem(true, parent),
+        MapItem(parent),
         m_warp(warp)
 {
     connect(m_warp, SIGNAL(changed()), this, SLOT(warpChanged()));
@@ -53,14 +53,6 @@ void WarpItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option,
     MapItem::paint(painter, option, widget);
 }
 
-void WarpItem::resizeBy(const QPointF& size)
-{
-    QRect area = m_warp->area();
-    area.setBottomRight(area.bottomRight() + size.toPoint());
-    m_warp->setArea(area);
-    MapItem::resizeBy(size);
-}
-
 void WarpItem::moveTo(const QPoint& point)
 {
     QRect area = m_warp->area();
diff --git a/sigmodr/widgets/WarpItem.h b/sigmodr/widgets/WarpItem.h
index 9f682715..d574202c 100644
--- a/sigmodr/widgets/WarpItem.h
+++ b/sigmodr/widgets/WarpItem.h
@@ -42,7 +42,6 @@ class SIGMODRWIDGETS_NO_EXPORT WarpItem : public MapItem
         
         void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
     protected:
-        void resizeBy(const QPointF& size);
         void moveTo(const QPoint& point);
     protected slots:
         void warpChanged();