From 1bcc239a9a68a847be6645b7d784db5cf6383828 Mon Sep 17 00:00:00 2001 From: Derrick Date: Mon, 9 Mar 2026 19:31:27 +0800 Subject: [PATCH] Added check for esc key to close dialog (#12697) Added wx event for esc to close dialog for filament grouping dialog JIRA-139 --- src/slic3r/GUI/FilamentMapDialog.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index c1cb16c545..c0120c2c80 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -207,6 +207,17 @@ FilamentMapDialog::FilamentMapDialog(wxWindow *parent, m_ok_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_ok, this); m_cancel_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_cancle, this); + SetEscapeId(wxID_CANCEL); + Bind(wxEVT_CHAR_HOOK, [this](wxKeyEvent& e) { + if (e.GetKeyCode() == WXK_ESCAPE) { + if (IsModal()) + EndModal(wxID_CANCEL); + else + Close(); + return; + } + e.Skip(); + }); m_auto_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_switch_mode, this); m_manual_btn->Bind(wxEVT_BUTTON, &FilamentMapDialog::on_switch_mode, this);