change implement of blend sub node

2021-06-07 16:19:00 +08:00
parent dca581d641
commit 710f680240
3 changed files with 16 additions and 6 deletions
--- a/doric-Qt/example/doric/shader/DoricSuperNode.h
+++ b/doric-Qt/example/doric/shader/DoricSuperNode.h
@@ -16,8 +16,6 @@ protected:

  virtual void blendSubNode(QJsonValue subProperties) = 0;

-  virtual void blendSubNode(DoricViewNode *subNode, QJsonValue layoutConfig);
-
  void recursiveMixin(QJsonValue src, QJsonValue target);

 public:
@@ -31,6 +29,8 @@ public:

  virtual DoricViewNode *getSubNodeById(QString id) = 0;

+  virtual void blendSubNode(DoricViewNode *subNode, QJsonValue layoutConfig);
+
 private:
  void mixinSubNode(QJsonValue subNode);