AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-layout QProgressDialog when setting the cancel button

Browse Source 
Setting a cancel button on QProgressDialog more than once caused the layout
to be invalid. The layout was only applied when the dialog resizes or the
style changes, but not when a new cancel button is set.

The solution is to update the layout() before showing the dialog when adopting
new child widgets.

Fixes: QTBUG-19983
Pick-to: 6.0 6.1
Change-Id: Id8fb1ac56e94a9bd97d4559a2e8d4835856fd7d0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Qiang Li 2021-04-14 11:15:46 +08:00 committed by Volker Hilsheimer
parent 82f8519b82
commit 777053cfff
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qprogressdialog.cpp
View File

@ -485,6 +485,8 @@ void QProgressDialogPrivate::adoptChildWidget(QWidget *c)
c->setParent(q, { }); c->setParent(q, { });
} }
ensureSizeIsAtLeastSizeHint(); ensureSizeIsAtLeastSizeHint();
//The layout should be updated again to prevent layout errors when the new 'widget' is replaced
layout();
if (c) if (c)
c->show(); c->show();
} }

24
tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
View File

@ -51,6 +51,7 @@ private Q_SLOTS:
void getSetCheck(); void getSetCheck();
void task198202(); void task198202();
void QTBUG_31046(); void QTBUG_31046();
void QTBUG_19983();
void settingCustomWidgets(); void settingCustomWidgets();
void i18n(); void i18n();
void setValueReentrancyGuard(); void setValueReentrancyGuard();
@ -210,6 +211,29 @@ void tst_QProgressDialog::QTBUG_31046()
QCOMPARE(50, dlg.value()); QCOMPARE(50, dlg.value());
} }
void tst_QProgressDialog::QTBUG_19983()
{
QProgressDialog tempDlg;
tempDlg.setRange(0, 0);
tempDlg.setLabelText("This is a test.");
QPushButton *btnOne = new QPushButton("Cancel", &tempDlg);
tempDlg.setCancelButton(btnOne);
tempDlg.show();
QVERIFY(QTest::qWaitForWindowExposed(&tempDlg));
const auto btnOneGeometry = btnOne->geometry();
QVERIFY(QPoint(0,0) != btnOneGeometry.topLeft());
tempDlg.cancel();
QVERIFY(!tempDlg.isVisible());
QPushButton *btnTwo = new QPushButton("Cancel", &tempDlg);
tempDlg.setCancelButton(btnTwo);
tempDlg.show();
QVERIFY(QTest::qWaitForWindowExposed(&tempDlg));
QCOMPARE(btnOneGeometry, btnTwo->geometry());
}
void tst_QProgressDialog::settingCustomWidgets() void tst_QProgressDialog::settingCustomWidgets()
{ {
QPointer<QLabel> l = new QLabel; QPointer<QLabel> l = new QLabel;