Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuSanka <yusanka@gmail.com>2019-01-15 12:24:58 +0300
committerYuSanka <yusanka@gmail.com>2019-01-15 12:31:34 +0300
commit519f5e5ea7c96db4b7ae64c7f48d1bc8c720dbf3 (patch)
treed06363b6603d079a61acdb33cbebcab935409176 /src/slic3r/GUI/FirmwareDialog.cpp
parent7cb90956eef985ad4e74ab2e5eae8f8da848aa82 (diff)
Fix of #1606
+ Added dialog closing by "Esc" button for the FirmwareDialog.
Diffstat (limited to 'src/slic3r/GUI/FirmwareDialog.cpp')
-rw-r--r--src/slic3r/GUI/FirmwareDialog.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/slic3r/GUI/FirmwareDialog.cpp b/src/slic3r/GUI/FirmwareDialog.cpp
index 418d1a3c9..2df1f0bc9 100644
--- a/src/slic3r/GUI/FirmwareDialog.cpp
+++ b/src/slic3r/GUI/FirmwareDialog.cpp
@@ -775,6 +775,8 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
SetSize(std::max(size.GetWidth(), static_cast<int>(MIN_WIDTH)), std::max(size.GetHeight(), static_cast<int>(MIN_HEIGHT)));
Layout();
+ SetEscapeId(wxID_CLOSE); // To close the dialog using "Esc" button
+
// Bind events
p->hex_picker->Bind(wxEVT_FILEPICKER_CHANGED, [this](wxFileDirPickerEvent& evt) {
@@ -826,6 +828,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
if (this->p->avrdude) {
evt.Veto();
} else {
+ this->EndModal(wxID_CLOSE);
evt.Skip();
}
});