kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

PartDesign/Fem: [skip ci] when handling Del key make sure that deleteAction is instantiated

Browse Source
This commit is contained in:
wmayer
2020-02-19 11:31:40 +01:00
parent 97de09ad6f
commit 389b26c48e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Fem/Gui/TaskFemConstraint.cpp
View File

@@ -72,6 +72,7 @@ using namespace Gui;
TaskFemConstraint::TaskFemConstraint(ViewProviderFemConstraint *ConstraintView,QWidget *parent,const char* pixmapname)
: TaskBox(Gui::BitmapFactory().pixmap(pixmapname),tr("FEM constraint parameters"),true, parent)
, proxy(nullptr)
, deleteAction(nullptr)
, ConstraintView(ConstraintView)
, buttonBox(nullptr)
, okButton(nullptr)
@@ -205,7 +206,7 @@ bool TaskFemConstraint::KeyEvent(QEvent *e)
if (e && e->type() == QEvent::ShortcutOverride) {
QKeyEvent * kevent = static_cast<QKeyEvent*>(e);
if (kevent->modifiers() == Qt::NoModifier) {
if (kevent->key() == Qt::Key_Delete) {
if (deleteAction && kevent->key() == Qt::Key_Delete) {
kevent->accept();
return true;
}
@@ -215,7 +216,7 @@ bool TaskFemConstraint::KeyEvent(QEvent *e)
else if (e && e->type() == QEvent::KeyPress) {
QKeyEvent * kevent = static_cast<QKeyEvent*>(e);
if (kevent->key() == Qt::Key_Delete) {
if (deleteAction->isEnabled())
if (deleteAction && deleteAction->isEnabled())
deleteAction->trigger();
return true;
}