diff options
Diffstat (limited to 'src/layouts/qgridlayoutengine.cpp')
| -rw-r--r-- | src/layouts/qgridlayoutengine.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/layouts/qgridlayoutengine.cpp b/src/layouts/qgridlayoutengine.cpp index ae5da09ea..30c02c978 100644 --- a/src/layouts/qgridlayoutengine.cpp +++ b/src/layouts/qgridlayoutengine.cpp @@ -936,16 +936,17 @@ Qt::Alignment QGridLayoutEngine::effectiveAlignment(const QGridLayoutItem *layou // no vertical alignment, respect the row alignment int y = layoutItem->firstRow(); align |= (rowAlignment(y, Qt::Vertical) & Qt::AlignVertical_Mask); - if (!align) - align = Qt::AlignVCenter; + if (!(align & Qt::AlignVertical_Mask)) + align |= Qt::AlignVCenter; } if (!(align & Qt::AlignHorizontal_Mask)) { // no horizontal alignment, respect the column alignment int x = layoutItem->firstColumn(); align |= (rowAlignment(x, Qt::Horizontal) & Qt::AlignHorizontal_Mask); - if (!align) - align = Qt::AlignHCenter; + if (!(align & Qt::AlignHorizontal_Mask)) + align |= Qt::AlignHCenter; } + return align; } |