Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/GUI/canvaswindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ bool CanvasWindow::handleCutCopyPasteKeyPress(QKeyEvent *event)
event->key() == Qt::Key_X) {
if (event->isAutoRepeat()) { return false; }
(*mActions.cutAction)();
} else if (event->key() == Qt::Key_Delete) {
} else if (event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace) {
(*mActions.deleteAction)();
} else { return false; }
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/app/GUI/keysview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ bool KeysView::KFT_keyPressEvent(QKeyEvent *event)
clearKeySelection();
container->paste(mCurrentScene->getCurrentFrame(), true,
[this](Key* key) { addKeyToSelection(key); });
} else if(event->key() == Qt::Key_Delete) {
} else if(event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace) {
if(mGraphViewed) {
graphDeletePressed();
} else {
Expand Down
8 changes: 5 additions & 3 deletions src/app/GUI/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@ void MainWindow::setupMenuBar()
mEditMenu->addAction(qAct);
#ifndef Q_OS_MAC
qAct->setShortcut(Qt::Key_Delete);
qAct->setShortcut(Qt::Key_Backspace);
#endif
mActions.deleteAction->connect(qAct);
cmdAddAction(qAct);
Expand Down Expand Up @@ -1613,7 +1614,8 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *e)
const auto focusWidget = QApplication::focusWidget();
if (type == QEvent::KeyPress) {
const auto keyEvent = static_cast<QKeyEvent*>(e);
if (keyEvent->key() == Qt::Key_Delete && focusWidget) {
if ((keyEvent->key() == Qt::Key_Delete && focusWidget) ||
(keyEvent->key() == Qt::Key_Backspace && focusWidget)) {
mEventFilterDisabled = true;
const bool widHandled =
QCoreApplication::sendEvent(focusWidget, keyEvent);
Expand All @@ -1637,7 +1639,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *e)
key == Qt::Key_X || key == Qt::Key_D)) {
return processKeyEvent(keyEvent);
} else if (key == Qt::Key_A || key == Qt::Key_I ||
key == Qt::Key_Delete) {
key == Qt::Key_Delete || key == Qt::Key_Backspace) {
return processKeyEvent(keyEvent);
}
} else if (type == QEvent::KeyRelease) {
Expand Down Expand Up @@ -1690,7 +1692,7 @@ bool MainWindow::processBoxesListKeyEvent(QKeyEvent *event)
} else if (ctrl && event->key() == Qt::Key_X) {
if (event->isAutoRepeat()) { return false; }
(*mActions.cutAction)();
} else if (event->key() == Qt::Key_Delete) {
} else if (event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace) {
(*mActions.deleteAction)();
} else { return false; }
return true;
Expand Down
4 changes: 2 additions & 2 deletions src/core/Boxes/boundingbox.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -817,7 +817,7 @@ void BoundingBox::setupCanvasMenu(PropertyMenu * const menu)

menu->addPlainAction(QIcon::fromTheme("trash"), tr("Delete"), [pScene]() {
pScene->removeSelectedBoxesAndClearList();
})->setShortcut(Qt::Key_Delete);
})->setShortcut({Qt::Key_Delete, Qt::Key_Backspace});

menu->addSeparator();

Expand Down Expand Up @@ -1299,7 +1299,7 @@ void BoundingBox::prp_setupTreeViewMenu(PropertyMenu * const menu)
tr("Are you sure you want to delete selected item(s)?"));
if (ask != QMessageBox::Yes) { return; }*/
pScene->removeSelectedBoxesAndClearList();
})->setShortcut(Qt::Key_Delete);
})->setShortcuts({Qt::Key_Delete, Qt::Key_Backspace});
}

menu->addSeparator();
Expand Down