plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect behavior of minimum size for yoga layout (#814)

Browse Source
This commit is contained in:
Wyatt Kirby 2021-02-25 16:43:45 -05:00 committed by GitHub
parent 273254ff4e
commit 3fe8f17f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/cpp/lib/core/FlexLayout/flexlayout.cpp
View File

@ -147,16 +147,18 @@ QSize FlexLayout::sizeHint() const {
QSize FlexLayout::minimumSize() const {
calculateLayout();
QSize minSize = QSize(YGNodeLayoutGetWidth(this->node),
YGNodeLayoutGetHeight(this->node));
QSize minSize = QSize(YGNodeStyleGetMinWidth(this->node).value,
YGNodeStyleGetMinHeight(this->node).value);
return minSize;
}
void FlexLayout::setGeometry(const QRect& rect) {
this->cachedRect = rect;
if (this->throttleTimer.isActive()) {
return;
}
this->throttleTimer.start(10);
// This will call performLayout and throttle requests between 10ms.
}
@ -165,32 +167,30 @@ void FlexLayout::performLayout() {
if (!this->node) {
return;
}
QRect rect = this->cachedRect;
if (!rect.isValid() || rect != geometry()) {
bool isSizeControlled = flexutils::isFlexNodeSizeControlled(this->node);
YGValue prevStyleMinWidth = YGNodeStyleGetMinWidth(this->node);
YGValue prevStyleMinHeight = YGNodeStyleGetMinHeight(this->node);
if (isSizeControlled) {
YGNodeMarkDirtyAndPropogateToDescendants(this->node);
YGNodeStyleSetMinHeight(this->node, rect.height());
YGNodeStyleSetMinWidth(this->node, rect.width());
}
calculateLayout();
uint count = YGNodeGetChildCount(this->node);
for (uint i = 0; i < count; ++i) {
YGNode* childNode = YGNodeGetChild(this->node, i);
QRect childRect = flexutils::getFlexNodeGeometry(childNode);
FlexNodeContext* ctx = flexutils::getFlexNodeContext(childNode);
QLayoutItem* childItem = ctx->layoutItem();
childItem->setGeometry(childRect);
}
if (isSizeControlled) {
restoreNodeMinStyle(prevStyleMinWidth, prevStyleMinHeight);
}
if (flexutils::isFlexNodeSizeControlled(this->node)) {
YGNodeMarkDirtyAndPropogateToDescendants(this->node);
YGNodeStyleSetHeight(this->node, rect.height());
YGNodeStyleSetWidth(this->node, rect.width());
}
calculateLayout();
QRect calculatedRect = flexutils::getFlexNodeGeometry(this->node);
// Set our own geometry to calculated size
QLayout::setGeometry(calculatedRect);
// Iterate over children and set their geometry
uint count = YGNodeGetChildCount(this->node);
for (uint i = 0; i < count; ++i) {
YGNode* childNode = YGNodeGetChild(this->node, i);
QRect childRect = flexutils::getFlexNodeGeometry(childNode);
FlexNodeContext* ctx = flexutils::getFlexNodeContext(childNode);
QLayoutItem* childItem = ctx->layoutItem();
childItem->setGeometry(childRect);
}
QLayout::setGeometry(rect);
}
void FlexLayout::setFlexNode(YGNodeRef parentNode) { this->node = parentNode; }

2
src/lib/QtWidgets/QWidget.ts
View File

@ -19,7 +19,7 @@ import memoizeOne from 'memoize-one';
import { QGraphicsEffect } from './QGraphicsEffect';
/**
> Abstract class to add functionalities common to all Widgets.
**This class implements all methods, properties of Qt's [QWidget class](https://doc.qt.io/qt-5/qwidget.html) so that it can be inherited by all widgets**