1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWidget: Don't rely on topextra to determine if window is top level

Browse Source 
Doing so results in bailing out early for a widget that hasn't been
shown yet, or otherwise resulted in creating extra and topextra,
which means the normalGeometry will not reflect the widget's geometry.

Pick-to: 6.2
Change-Id: Ieb85e9a6109ae34fe20d79e3c12f4517f827a590
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2021-10-14 13:00:02 +02:00
parent c179549a74
commit e95e9c28f0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/kernel/qwidget.cpp
View File

@ -3668,7 +3668,7 @@ QPoint QWidget::pos() const
QRect QWidget::normalGeometry() const QRect QWidget::normalGeometry() const
{ {
Q_D(const QWidget); Q_D(const QWidget);
if (!d->extra || !d->extra->topextra) if (!isWindow())
return QRect(); return QRect();
if (!isMaximized() && !isFullScreen()) if (!isMaximized() && !isFullScreen())

1
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -3172,6 +3172,7 @@ void tst_QWidget::normalGeometry()
if (m_platform == QStringLiteral("wayland")) if (m_platform == QStringLiteral("wayland"))
QSKIP("Wayland: This fails. Figure out why."); QSKIP("Wayland: This fails. Figure out why.");
QWidget parent; QWidget parent;
QCOMPARE(parent.normalGeometry(), parent.geometry());
parent.setWindowTitle("NormalGeometry parent"); parent.setWindowTitle("NormalGeometry parent");
QWidget *child = new QWidget(&parent); QWidget *child = new QWidget(&parent);