From 703c349aded005a8aec6450984d82f3b58fe1fc3 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 23 Jul 2024 14:55:39 +0200
Subject: [PATCH] Spreadsheet: Delete key doesn't clear contents in selected
 cells

Fixes #15023. On macOS a different shortcut is defined for the 'Delete' key
---
 src/Mod/Spreadsheet/Gui/SheetTableView.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
index d9d2136380..fb57a8f85c 100644
--- a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
+++ b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp
@@ -582,16 +582,15 @@ bool SheetTableView::event(QEvent* event)
             case Qt::Key_Backtab:
                 finishEditWithMove(kevent->key(), kevent->modifiers(), true);
                 return true;
-            // Also handle the delete key here:
-            case Qt::Key_Delete:
-                deleteSelection();
-                return true;
             case Qt::Key_Escape:
                 sheet->setCopyOrCutRanges({});
                 return true;
             default:
                 break;
         }
+        if (kevent->matches(QKeySequence::Delete) || kevent->matches(QKeySequence::Backspace)) {
+            deleteSelection();
+        }
         if (kevent->matches(QKeySequence::Cut)) {
             cutSelection();
             return true;
@@ -614,8 +613,6 @@ bool SheetTableView::event(QEvent* event)
                     [[fallthrough]];
                 case Qt::Key_Enter:
                     [[fallthrough]];
-                case Qt::Key_Delete:
-                    [[fallthrough]];
                 case Qt::Key_Home:
                     [[fallthrough]];
                 case Qt::Key_End:
@@ -642,6 +639,9 @@ bool SheetTableView::event(QEvent* event)
             }
         }
 
+        if (kevent->matches(QKeySequence::Delete) || kevent->matches(QKeySequence::Backspace)) {
+            kevent->accept();
+        }
         if (kevent->matches(QKeySequence::Cut)) {
             kevent->accept();
         }