From 5845957c7d7e451b44e71c14424a0a00bdb5a87d Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 4 Jan 2021 16:49:19 +0100 Subject: [PATCH] Fix of second part of #5531 From the Win 2004 preset combobox lose a focus after change the preset selection and that is why the up/down arrow doesn't work properly. So, set the focus to the combobox explicitly. --- src/slic3r/GUI/Plater.cpp | 8 ++++++++ src/slic3r/GUI/PresetComboBoxes.cpp | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 4526bc51d..cb7066630 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3558,6 +3558,14 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt) */ wxGetApp().obj_list()->update_object_list_by_printer_technology(); } + +#ifdef __WXMSW__ + // From the Win 2004 preset combobox lose a focus after change the preset selection + // and that is why the up/down arrow doesn't work properly + // (see https://github.com/prusa3d/PrusaSlicer/issues/5531 ). + // So, set the focus to the combobox explicitly + combo->SetFocus(); +#endif } void Plater::priv::on_slicing_update(SlicingStatusEvent &evt) diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 2ef7b3e1f..6031edf78 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -905,6 +905,13 @@ TabPresetComboBox::TabPresetComboBox(wxWindow* parent, Preset::Type preset_type) } evt.StopPropagation(); +#ifdef __WXMSW__ + // From the Win 2004 preset combobox lose a focus after change the preset selection + // and that is why the up/down arrow doesn't work properly + // (see https://github.com/prusa3d/PrusaSlicer/issues/5531 ). + // So, set the focus to the combobox explicitly + this->SetFocus(); +#endif }); }