From 503ef79cea3f34961c391d2ad634e89daafcdc9b Mon Sep 17 00:00:00 2001
From: wwmayer <wmayer@freecad.org>
Date: Mon, 22 Sep 2025 16:16:26 +0200
Subject: [PATCH 1/2] Gui: Do not accept changes when pressing ESC key in 3D
 view

Forward the ESC key event to the Task view to reject changes if needed. This fixes issue https://github.com/FreeCAD/FreeCAD/issues/23504
---
 src/Gui/ViewProvider.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp
index f1a32892ac..a20244c560 100644
--- a/src/Gui/ViewProvider.cpp
+++ b/src/Gui/ViewProvider.cpp
@@ -23,6 +23,7 @@
 
 
 # include <QApplication>
+# include <QKeyEvent>
 # include <QTimer>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/actions/SoGetBoundingBoxAction.h>
@@ -48,6 +49,7 @@
 #include "Application.h"
 #include "BitmapFactory.h"
 #include "Document.h"
+#include "DockWindowManager.h"
 #include "SoFCDB.h"
 #include "View3DInventor.h"
 #include "View3DInventorViewer.h"
@@ -234,6 +236,12 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node)
                             }
                         }
 
+                        DockWindowManager* pDockMgr = DockWindowManager::instance();
+                        if (QWidget* widget = pDockMgr->getDockWindow("Tasks")) {
+                            QKeyEvent ev(QEvent::KeyPress, Qt::Key_Escape, Qt::NoModifier);
+                            qApp->sendEvent(widget, &ev);
+                        }
+
                         auto func = new Gui::TimerFunction();
                         func->setAutoDelete(true);
                         func->setFunction([doc]() {

From f6f919d2290905849f6a5de45170bbcbd73c4423 Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@gmail.com>
Date: Thu, 23 Oct 2025 14:39:31 -0500
Subject: [PATCH 2/2] Gui: Use postEvent instead of sendEvent for Esc handling

See https://github.com/FreeCAD/FreeCAD/pull/24277#issuecomment-3342091132

Co-authored-by: wwmayer <wmayer@freecad.org>
---
 src/Gui/ViewProvider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gui/ViewProvider.cpp b/src/Gui/ViewProvider.cpp
index a20244c560..148fd1ad52 100644
--- a/src/Gui/ViewProvider.cpp
+++ b/src/Gui/ViewProvider.cpp
@@ -239,7 +239,7 @@ void ViewProvider::eventCallback(void * ud, SoEventCallback * node)
                         DockWindowManager* pDockMgr = DockWindowManager::instance();
                         if (QWidget* widget = pDockMgr->getDockWindow("Tasks")) {
                             QKeyEvent ev(QEvent::KeyPress, Qt::Key_Escape, Qt::NoModifier);
-                            qApp->sendEvent(widget, &ev);
+                            qApp->postEvent(widget, &ev);
                         }
 
                         auto func = new Gui::TimerFunction();