fix layout bug

doric-Qt/example/doric/shader/DoricScrollerNode.cpp

@@ -113,12 +113,11 @@ QSizeF DoricScrollerNode::sizeThatFits(QSizeF size) {
                              ->property("doricLayout")
                              .toULongLong();
 
-  if (layout->getResolved()) {
+  if (!layout->getResolved()) {
     layout->apply(size);
   }
 
-  return QSizeF(qMax(size.width(), layout->getMeasuredWidth()),
+  return QSizeF(layout->getMeasuredWidth(), layout->getMeasuredHeight());
-                qMax(size.height(), layout->getMeasuredHeight()));
 }
 
 DoricViewNode *DoricScrollerNode::getSubNodeById(QString id) {

doric-Qt/example/doric/shader/DoricSuperNode.cpp

@@ -12,6 +12,8 @@ void DoricSuperNode::blend(QQuickItem *view, QString name, QJsonValue prop) {
         mixinSubNode(subNode);
         blendSubNode(subNode);
       }
+
+      getLayouts()->setResolved(false);
     }
   } else {
     DoricViewNode::blend(view, name, prop);

doric-Qt/example/doric/shader/DoricTextNode.cpp

@@ -98,3 +98,9 @@ void DoricTextNode::blend(QQuickItem *view, QString name, QJsonValue prop) {
     DoricViewNode::blend(view, name, prop);
   }
 }
+
+void DoricTextNode::blend(QJsonValue jsValue) {
+  DoricViewNode::blend(jsValue);
+
+  getLayouts()->setResolved(false);
+}

doric-Qt/example/doric/shader/DoricTextNode.h

@@ -13,6 +13,8 @@ public:
 
   virtual void blendLayoutConfig(QJsonValue jsObject) override;
 
+  virtual void blend(QJsonValue jsValue) override;
+
   virtual void blend(QQuickItem *view, QString name, QJsonValue prop) override;
 };
 

doric-Qt/example/doric/utils/DoricLayouts.cpp

@@ -753,3 +753,5 @@ void DoricLayouts::setMeasuredY(qreal measuredY) {
 }
 
 bool DoricLayouts::getResolved() { return resolved; }
+
+void DoricLayouts::setResolved(bool resolved) { this->resolved = resolved; }

doric-Qt/example/doric/utils/DoricLayouts.h

@@ -94,6 +94,7 @@ public:
   qreal getMeasuredHeight();
 
   bool getResolved();
+  void setResolved(bool resolved);
 
 private:
   QString tag;