oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olive-editor/olive

Browse Source
This commit is contained in:
itsmattkc
2021-07-24 09:37:17 -07:00
parent db29dfdf1a 3f785f30fd
commit e433d7c374
29 changed files with 426 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/graph.h
+1 -1
View File
@@ -96,7 +96,7 @@ public:
qreal GetNodeContextHeight(Node *context);
using PositionMap = QMap<Node*, QPointF>;
using PositionMap = QHash<Node*, QPointF>;
const PositionMap &GetNodesForContext(Node *context)
{
app/node/nodecopypaste.cpp
+2 -2
View File
@@ -70,7 +70,7 @@ void NodeCopyPasteService::CopyNodesToClipboard(const QVector<Node *> &nodes, vo
writer.writeEndElement(); // contexts
writer.writeStartElement(QStringLiteral("custom"));
CopyNodesToClipboardInternal(&writer, userdata);
CopyNodesToClipboardInternal(&writer, nodes, userdata);
writer.writeEndElement(); // custom
writer.writeEndElement(); // olive
@@ -229,7 +229,7 @@ QVector<Node *> NodeCopyPasteService::PasteNodesFromClipboard(NodeGraph *graph,
return pasted_nodes;
}
void NodeCopyPasteService::CopyNodesToClipboardInternal(QXmlStreamWriter*, void*)
void NodeCopyPasteService::CopyNodesToClipboardInternal(QXmlStreamWriter*, const QVector<Node *> &, void*)
{
}
app/node/nodecopypaste.h
+1 -1
View File
@@ -39,7 +39,7 @@ protected:
QVector<Node*> PasteNodesFromClipboard(NodeGraph *graph, MultiUndoCommand *command, void* userdata = nullptr);
virtual void CopyNodesToClipboardInternal(QXmlStreamWriter *writer, void* userdata);
virtual void CopyNodesToClipboardInternal(QXmlStreamWriter *writer, const QVector<Node*> &nodes, void* userdata);
virtual void PasteNodesFromClipboardInternal(QXmlStreamReader *reader, XMLNodeData &xml_node_data, void* userdata);