Merge branch 'paceholder:master' into plugin_extension

Author: zmoth

examples/resizable_images/ImageLoaderModel.cpp

@@ -17,7 +17,8 @@ ImageLoaderModel()
 
   _label->setFont(f);
 
-  _label->setFixedSize(200, 200);
+  _label->setMinimumSize(200, 200);
+  _label->setMaximumSize(500, 300);
 
   _label->installEventFilter(this);
 }

examples/resizable_images/ImageShowModel.cpp

@@ -21,7 +21,7 @@ ImageShowModel()
 
   _label->setFont(f);
 
-  _label->setFixedSize(200, 200);
+  _label->setMinimumSize(200, 200);
 
   _label->installEventFilter(this);
 }

include/QtNodes/internal/GraphicsView.hpp

@@ -70,6 +70,12 @@ public Q_SLOTS:
   void
   onDuplicateSelectedObjects();
 
+  void
+  onCopySelectedObjects();
+
+  void
+  onPasteObjects();
+
 Q_SIGNALS:
   void
   scaleChanged(double scale);
@@ -103,10 +109,16 @@ public Q_SLOTS:
   BasicGraphicsScene*
   nodeScene();
 
+  /// Computes scene position for pasting the copied/duplicated node groups.
+  QPointF
+  scenePastePosition();
+
 private:
   QAction* _clearSelectionAction = nullptr;
   QAction* _deleteSelectionAction = nullptr;
   QAction* _duplicateSelectionAction = nullptr;
+  QAction* _copySelectionAction = nullptr;
+  QAction* _pasteAction = nullptr;
 
   QPointF _clickPos;
   ScaleRange _scaleRange;

src/GraphicsView.cpp

@@ -32,6 +32,8 @@ GraphicsView(QWidget* parent)
   , _clearSelectionAction(Q_NULLPTR)
   , _deleteSelectionAction(Q_NULLPTR)
   , _duplicateSelectionAction(Q_NULLPTR)
+  , _copySelectionAction(Q_NULLPTR)
+  , _pasteAction(Q_NULLPTR)
 {
   setDragMode(QGraphicsView::ScrollHandDrag);
   setRenderHint(QPainter::Antialiasing);
@@ -128,6 +130,34 @@ setScene(BasicGraphicsScene* scene)
     addAction(_duplicateSelectionAction);
   }
 
+  {
+    delete _copySelectionAction;
+    _copySelectionAction = new QAction(QStringLiteral("Copy Selection"), this);
+    _copySelectionAction->setShortcutContext(Qt::ShortcutContext::WidgetShortcut);
+    _copySelectionAction->setShortcut(QKeySequence(QKeySequence::Copy));
+    connect(_copySelectionAction,
+            &QAction::triggered,
+            this,
+            &GraphicsView::onCopySelectedObjects);
+
+    addAction(_copySelectionAction);
+
+  }
+
+  {
+    delete _pasteAction;
+    _pasteAction = new QAction(QStringLiteral("Copy Selection"), this);
+    _pasteAction->setShortcutContext(Qt::ShortcutContext::WidgetShortcut);
+    _pasteAction->setShortcut(QKeySequence(QKeySequence::Paste));
+    connect(_pasteAction,
+            &QAction::triggered,
+            this,
+            &GraphicsView::onPasteObjects);
+
+    addAction(_pasteAction);
+
+  }
+
 
   auto undoAction = scene->undoStack().createUndoAction(this, tr("&Undo"));
   undoAction->setShortcuts(QKeySequence::Undo);
@@ -310,15 +340,27 @@ void
 GraphicsView::
 onDuplicateSelectedObjects()
 {
-  QPoint origin = mapFromGlobal(QCursor::pos());
+  QPointF const pastePosition = scenePastePosition();
 
-  QRect const viewRect = rect();
-  if (!viewRect.contains(origin))
-    origin = viewRect.center();
+  nodeScene()->undoStack().push(new CopyCommand(nodeScene()));
+  nodeScene()->undoStack().push(new PasteCommand(nodeScene(), pastePosition));
+}
 
-  QPointF relativeOrigin = mapToScene(origin);
 
-  nodeScene()->undoStack().push(new DuplicateCommand(nodeScene(), relativeOrigin));
+void
+GraphicsView::
+onCopySelectedObjects()
+{
+  nodeScene()->undoStack().push(new CopyCommand(nodeScene()));
+}
+
+
+void
+GraphicsView::
+onPasteObjects()
+{
+  QPointF const pastePosition = scenePastePosition();
+  nodeScene()->undoStack().push(new PasteCommand(nodeScene(), pastePosition));
 }
 
 
@@ -453,3 +495,16 @@ nodeScene()
   return dynamic_cast<BasicGraphicsScene*>(scene());
 }
 
+
+QPointF
+GraphicsView::
+scenePastePosition()
+{
+  QPoint origin = mapFromGlobal(QCursor::pos());
+
+  QRect const viewRect = rect();
+  if (!viewRect.contains(origin))
+    origin = viewRect.center();
+
+  return mapToScene(origin);
+}

src/NodeGraphicsObject.cpp

@@ -318,14 +318,10 @@ mouseMoveEvent(QGraphicsSceneMouseEvent* event)
 
       oldSize += QSize(diff.x(), diff.y());
 
-      w->setFixedSize(oldSize);
+      w->resize(oldSize);
 
       AbstractNodeGeometry & geometry = nodeScene()->nodeGeometry();
 
-      _proxyWidget->setMinimumSize(oldSize);
-      _proxyWidget->setMaximumSize(oldSize);
-      _proxyWidget->setPos(geometry.widgetPosition(_nodeId));
-
       // Passes the new size to the model.
       geometry.recomputeSize(_nodeId);