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

QFileDialog: preserve window state after delayed widget dialog creation

Browse Source 
The widget UI for a QFileDialog is sometimes created lazily as a fallback
when the dialog is about to show (the reson being that the platform reports
that is has native dialogs, but fails showing it, perhaps because of
unsupported configuration). In that case, the widget setup code will resize
the dialog to default sizes, and as such, wipe out any explicitly set
geometry or window states.

This is especially visible on iOS, since there we show all windows
maximized by default. If the fallback triggers, the dialog will
loose the maximized state and be shown partially outside the
screen without a way to close it.

This patch will make sure that even if the widgets are created late, we
still respect any geometry or window states set by the application.

Note: The bug became visible after: 6468cf4e

Change-Id: Ib2b87cd24e959c547208aa1cf76d683b9cbc283a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
This commit is contained in:
Richard Moe Gustavsen 2015-09-16 15:18:24 +02:00
parent 363e6e3d52
commit c7fa644c38
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/dialogs/qfiledialog.cpp
View File

@ -2806,6 +2806,13 @@ void QFileDialogPrivate::createWidgets()
if (qFileDialogUi)
return;
Q_Q(QFileDialog);
// This function is sometimes called late (e.g as a fallback from setVisible). In that case we
// need to ensure that the following UI code (setupUI in particular) doesn't reset any explicitly
// set window state or geometry.
QSize preSize = q->testAttribute(Qt::WA_Resized) ? q->size() : QSize();
Qt::WindowStates preState = q->windowState();
model = new QFileSystemModel(q);
model->setFilter(options->filter());
model->setObjectName(QLatin1String("qt_filesystem_model"));
@ -2967,7 +2974,8 @@ void QFileDialogPrivate::createWidgets()
lineEdit()->selectAll();
_q_updateOkButton();
retranslateStrings();
q->resize(q->sizeHint());
q->resize(preSize.isValid() ? preSize : q->sizeHint());
q->setWindowState(preState);
}
void QFileDialogPrivate::_q_showHeader(QAction *action)