dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 05:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix QMenu delete crash issue in WebViewer

Browse Source
This commit is contained in:
Le Tan 2024-06-11 22:13:56 +08:00
parent bfb0e5bd29
commit 2ebb210c57
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/editors/markdownviewer.cpp
View File

@ -109,9 +109,9 @@ void MarkdownViewer::setPreviewHelper(PreviewHelper *p_previewHelper)
void MarkdownViewer::contextMenuEvent(QContextMenuEvent *p_event) void MarkdownViewer::contextMenuEvent(QContextMenuEvent *p_event)
{ {
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QScopedPointer<QMenu> menu(page()->createStandardContextMenu()); QMenu* menu(page()->createStandardContextMenu());
#else #else
QScopedPointer<QMenu> menu(createStandardContextMenu()); QMenu* menu(createStandardContextMenu());
#endif #endif
const QList<QAction *> actions = menu->actions(); const QList<QAction *> actions = menu->actions();
@ -133,7 +133,7 @@ void MarkdownViewer::contextMenuEvent(QContextMenuEvent *p_event)
if (!hasSelection() && m_viewWindow && m_viewWindow->getMode() == ViewWindowMode::Read) { if (!hasSelection() && m_viewWindow && m_viewWindow->getMode() == ViewWindowMode::Read) {
auto firstAct = actions.isEmpty() ? nullptr : actions[0]; auto firstAct = actions.isEmpty() ? nullptr : actions[0];
auto editAct = new QAction(tr("&Edit"), menu.data()); auto editAct = new QAction(tr("&Edit"), menu);
WidgetUtils::addActionShortcutText(editAct, WidgetUtils::addActionShortcutText(editAct,
ConfigMgr::getInst().getEditorConfig().getShortcut(EditorConfig::Shortcut::EditRead)); ConfigMgr::getInst().getEditorConfig().getShortcut(EditorConfig::Shortcut::EditRead));
connect(editAct, &QAction::triggered, connect(editAct, &QAction::triggered,
@ -151,7 +151,7 @@ void MarkdownViewer::contextMenuEvent(QContextMenuEvent *p_event)
{ {
auto defaultCopyImageAct = pageAction(QWebEnginePage::CopyImageToClipboard); auto defaultCopyImageAct = pageAction(QWebEnginePage::CopyImageToClipboard);
if (actions.contains(defaultCopyImageAct)) { if (actions.contains(defaultCopyImageAct)) {
QAction *copyImageAct = new QAction(defaultCopyImageAct->text(), menu.data()); QAction *copyImageAct = new QAction(defaultCopyImageAct->text(), menu);
copyImageAct->setToolTip(defaultCopyImageAct->toolTip()); copyImageAct->setToolTip(defaultCopyImageAct->toolTip());
connect(copyImageAct, &QAction::triggered, connect(copyImageAct, &QAction::triggered,
this, &MarkdownViewer::copyImage); this, &MarkdownViewer::copyImage);
@ -163,11 +163,11 @@ void MarkdownViewer::contextMenuEvent(QContextMenuEvent *p_event)
{ {
auto copyAct = pageAction(QWebEnginePage::Copy); auto copyAct = pageAction(QWebEnginePage::Copy);
if (actions.contains(copyAct)) { if (actions.contains(copyAct)) {
setupCrossCopyMenu(menu.data(), copyAct); setupCrossCopyMenu(menu, copyAct);
} }
} }
hideUnusedActions(menu.data()); hideUnusedActions(menu);
p_event->accept(); p_event->accept();
@ -183,6 +183,11 @@ void MarkdownViewer::contextMenuEvent(QContextMenuEvent *p_event)
if (valid) { if (valid) {
menu->exec(p_event->globalPos()); menu->exec(p_event->globalPos());
} }
// For Qt 6, the menu is set with WA_DeleteOnClose.
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
delete menu;
#endif
} }
void MarkdownViewer::handleCopyImageUrlAction() void MarkdownViewer::handleCopyImageUrlAction()