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

Use popup() instead of exec() for file dialog's context menu

Browse Source 
There are seemingly no differences in how the menu operates and this
fixes WASM without asyncify hanging on menu open attempts.

Fixes: QTBUG-104963
Change-Id: If4364f08acb75947e03ecced85d77af9af0498ba
Pick-to: 6.4
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Mikolaj Boc 2022-08-01 14:35:43 +02:00 committed by Mikołaj Boc
parent 0131dbd2f9
commit 86bb62f2e7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3486,23 +3486,26 @@ void QFileDialogPrivate::_q_showContextMenu(const QPoint &position)
QModelIndex index = view->indexAt(position);
index = mapToSource(index.sibling(index.row(), 0));
QMenu menu(view);
QMenu *menu = new QMenu(view);
menu->setAttribute(Qt::WA_DeleteOnClose);
if (index.isValid()) {
// file context menu
const bool ro = model && model->isReadOnly();
QFile::Permissions p(index.parent().data(QFileSystemModel::FilePermissions).toInt());
renameAction->setEnabled(!ro && p & QFile::WriteUser);
menu.addAction(renameAction);
menu->addAction(renameAction);
deleteAction->setEnabled(!ro && p & QFile::WriteUser);
menu.addAction(deleteAction);
menu.addSeparator();
menu->addAction(deleteAction);
menu->addSeparator();
}
menu.addAction(showHiddenAction);
menu->addAction(showHiddenAction);
if (qFileDialogUi->newFolderButton->isVisible()) {
newFolderAction->setEnabled(qFileDialogUi->newFolderButton->isEnabled());
menu.addAction(newFolderAction);
menu->addAction(newFolderAction);
}
menu.exec(view->viewport()->mapToGlobal(position));
menu->popup(view->viewport()->mapToGlobal(position));
#endif // QT_CONFIG(menu)
}