gui/command/createnodecommand.cpp

@@ -16,7 +16,7 @@ CreateNodeCommand::CreateNodeCommand(ComposerScene *scene, const QString &nodeNa
 
 void CreateNodeCommand::redo()
 {
-    _scene->addNode(_nodeName, _nodeUid)->setPos(_pos);
+    _scene->addNode(_nodeName, _nodeUid, _pos);
 }
 
 void CreateNodeCommand::undo()

gui/command/movenodecommand.cpp

@@ -35,9 +35,5 @@ bool MoveNodeCommand::mergeWith(const QUndoCommand *other)
 
 void MoveNodeCommand::moveToPos(const QPointF &pos)
 {
-    auto node = _composerScene->findNode(_nodeUid);
-    if(node)
-    {
-        node->setPos(pos);
-    }
+    _composerScene->moveNode(_nodeUid, pos);
 }

gui/composerscene.cpp

@@ -55,6 +55,8 @@ ComposerScene::ComposerScene(QUndoStack *commandsStack, QObject *parent) :
     init();
 
     _scheduler->start();
+
+    computeOptimalSceneRect();
 }
 
 ComposerScene::ComposerScene(const QDomDocument &doc,
@@ -100,17 +102,17 @@ const QList<GenericNodeItem *> &ComposerScene::getNodes() const
     return _nodes;
 }
 
-GenericNodeItem *ComposerScene::findNode(const QUuid &uid) const
+void ComposerScene::moveNode(const QUuid &uid, const QPointF &pos)
 {
     for(GenericNodeItem *item : _nodes)
     {
         if(item->getNode()->getUid() == uid)
         {
-            return item;
+            item->setPos(pos);
+            computeOptimalSceneRect();
+            return;
         }
     }
-
-    return nullptr;
 }
 
 const QList<ConnectionItem *> &ComposerScene::getConnections() const
@@ -150,6 +152,12 @@ GenericNodeItem *ComposerScene::addNode(const QString &nodeName, const QUuid &ui
     return item;
 }
 
+void ComposerScene::addNode(const QString &nodeName, const QUuid &uid, const QPointF &pos)
+{
+    addNode(nodeName, uid)->setPos(pos);
+    computeOptimalSceneRect();
+}
+
 void ComposerScene::save(QDomDocument &doc, QMainWindow *mainWindow) const
 {
     QDomElement rootNode = doc.createElement(QCoreApplication::applicationName().toLower());
@@ -275,6 +283,8 @@ void ComposerScene::load(const QDomDocument &doc, QMainWindow *mainWindow)
             _scheduler->setSettings(settings);
         }
     }
+
+    computeOptimalSceneRect();
 }
 
 void ComposerScene::loadNode(const QDomElement &node)
@@ -431,6 +441,8 @@ void ComposerScene::dropEvent(QGraphicsSceneDragDropEvent *event)
 
 void ComposerScene::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+    _mouseMoving = true;
+
     if(event->button() == Qt::LeftButton)
     {
         event->setModifiers(event->modifiers() & ~Qt::ControlModifier);
@@ -652,6 +664,8 @@ void ComposerScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 
 void ComposerScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
+    _mouseMoving = false;
+
     // Disable multi-selection
     event->setModifiers(event->modifiers() & ~Qt::ControlModifier);
 
@@ -686,6 +700,7 @@ void ComposerScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
     {
         _editedNode.item = nullptr;
         event->widget()->setCursor(Qt::OpenHandCursor);
+        computeOptimalSceneRect();
     }
     else
     {
@@ -724,6 +739,7 @@ void ComposerScene::onNodeRemoved(const Node *node)
             removeItem(nodeItem);
             delete nodeItem;
             _nodes.removeAll(nodeItem);
+            computeOptimalSceneRect();
             break;
         }
     }
@@ -912,3 +928,28 @@ QUuid ComposerScene::loadUid(const QDomElement &node, const QString &attributePr
 
     return uid;
 }
+
+void ComposerScene::computeOptimalSceneRect()
+{
+    if(!_mouseMoving)
+    {
+        constexpr double extends = 1000;
+        QRectF rect;
+
+        for(const GenericNodeItem *item : _nodes)
+        {
+            QRectF itemRect = item->boundingRect();
+            itemRect.translate(item->pos());
+            if(rect.isEmpty())
+            {
+                rect = itemRect;
+            }
+            else
+            {
+                rect = rect.united(itemRect);
+            }
+        }
+
+        setSceneRect(rect.adjusted(-extends, -extends, extends, extends));
+    }
+}

gui/composerscene.h

@@ -46,15 +46,15 @@ class ComposerScene : public QGraphicsScene
 
         const QList<GenericNodeItem *> &getNodes() const;
 
-        GenericNodeItem *findNode(const QUuid &uid) const;
+        void moveNode(const QUuid &uid, const QPointF &pos);
 
         const QList<ConnectionItem *> &getConnections() const;
 
         const ComposerScheduler *getScheduler() const;
 
         ComposerScheduler *accessScheduler();
 
-        GenericNodeItem *addNode(const QString &nodeName, const QUuid &uid);
+        void addNode(const QString &nodeName, const QUuid &uid, const QPointF &pos);
 
         const ComposerModel *getModel() const { return _model; }
 
@@ -119,6 +119,10 @@ class ComposerScene : public QGraphicsScene
 
         QUuid loadUid(const QDomElement &node, const QString &attributePrefix = "");
 
+        void computeOptimalSceneRect();
+
+        GenericNodeItem *addNode(const QString &nodeName, const QUuid &uid);
+
     private:
         struct EditedConnection
         {
@@ -146,4 +150,5 @@ class ComposerScene : public QGraphicsScene
         EditedNode _editedNode;
         QList<ConnectionItem *> _connections;
         QList<GenericNodeItem *> _nodes;
+        bool _mouseMoving{false};
 };

gui/composerwidget.cpp

@@ -74,6 +74,4 @@ void ComposerWidget::replaceScene(ComposerScene *newScene)
     {
         _helpLabel->hide();
     }
-
-    setSceneRect(-3000, -3000, 6000, 6000);
 }

gui/genericnodeitem.h

@@ -74,12 +74,12 @@ class GenericNodeItem : public QObject, public QGraphicsItem
 
         bool startDragging(const QPointF &mousePos);
 
+        virtual QRectF boundingRect() const override;
+
     signals:
         void plugValueChanged(const QString &name, const QVariant &value);
 
     protected:
-        virtual QRectF boundingRect() const override;
-
         virtual void paint(QPainter *painter,
                            const QStyleOptionGraphicsItem *option,
                            QWidget *widget) override;

gui/interactivegraphicsview.cpp

@@ -26,7 +26,7 @@
 InteractiveGraphicsView::InteractiveGraphicsView(QWidget *parent) :
     QGraphicsView(parent),
     _zoom(0),
-    _minZoom(1),
+    _minZoom(0),
     _maxZoom(10)
 {
     resetZoom();