layout bug fix

2021-05-28 13:27:11 +08:00
parent 4c427fc257
commit af1ef2a103
3 changed files with 10 additions and 3 deletions
--- a/doric-Qt/example/doric/shader/DoricScrollerNode.cpp
+++ b/doric-Qt/example/doric/shader/DoricScrollerNode.cpp
@@ -112,10 +112,13 @@ QSizeF DoricScrollerNode::sizeThatFits(QSizeF size) {
  DoricLayouts *layout = (DoricLayouts *)mChildNode->getNodeView()
                             ->property("doricLayout")
                             .toULongLong();
-  layout->apply(size);

-  return QSizeF(qMin(size.width(), layout->getMeasuredWidth()),
-                qMin(size.height(), layout->getMeasuredHeight()));
+  if (layout->getResolved()) {
+    layout->apply(size);
+  }
+
+  return QSizeF(qMax(size.width(), layout->getMeasuredWidth()),
+                qMax(size.height(), layout->getMeasuredHeight()));
 }

 DoricViewNode *DoricScrollerNode::getSubNodeById(QString id) {