feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix easing-curve-editor context menu for macOS

Browse Source 
Change-Id: I99eac383dbd247e42392424712eed001e2750008
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Knud Dollereder
2020-09-07 12:48:07 +02:00
committed by Thomas Hartmann
parent b0cad9e9c7
commit d64ebc0f8b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmldesigner/components/timelineeditor/preseteditor.cpp
View File

@@ -348,18 +348,19 @@ void PresetList::contextMenuEvent(QContextMenuEvent *event)
if (m_scope == QSettings::SystemScope) if (m_scope == QSettings::SystemScope)
return; return;
QMenu menu; auto *menu = new QMenu(this);
QAction *addAction = menu.addAction(tr("Add Preset")); QAction *addAction = menu->addAction(tr("Add Preset"));
connect(addAction, &QAction::triggered, [&]() { createItem(); }); connect(addAction, &QAction::triggered, [&]() { createItem(); });
if (selectionModel()->hasSelection()) { if (selectionModel()->hasSelection()) {
QAction *removeAction = menu.addAction(tr("Delete Selected Preset")); QAction *removeAction = menu->addAction(tr("Delete Selected Preset"));
connect(removeAction, &QAction::triggered, [&]() { removeSelectedItem(); }); connect(removeAction, &QAction::triggered, [&]() { removeSelectedItem(); });
} }
menu.exec(event->globalPos()); menu->exec(event->globalPos());
menu->deleteLater();
} }
void PresetList::dataChanged(const QModelIndex &topLeft, void PresetList::dataChanged(const QModelIndex &topLeft,

1
src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp
View File

@@ -253,6 +253,7 @@ void SplineEditor::contextMenuEvent(QContextMenuEvent *e)
}); });
menu->exec(e->globalPos()); menu->exec(e->globalPos());
menu->deleteLater();
e->accept(); e->accept();
} }