fix layout bug

2021-06-15 17:36:01 +08:00
parent 738566e043
commit 50f80a3fe4
6 changed files with 15 additions and 3 deletions
--- a/doric-Qt/example/doric/shader/DoricScrollerNode.cpp
+++ b/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()),
-                qMax(size.height(), layout->getMeasuredHeight()));
+  return QSizeF(layout->getMeasuredWidth(), layout->getMeasuredHeight());
 }

 DoricViewNode *DoricScrollerNode::getSubNodeById(QString id) {