3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: call DismissAndNotify to manual close popup

Browse source 
Change-Id: I395708a98dda390f81d52151c9c52ba367de5a3d
This commit is contained in:
chunmao.guo 2022-08-04 16:25:14 +08:00 • committed by Lane.Wei
parent b03a93d7fc
commit 8300c386e0
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/Widgets/ComboBox.cpp
View file

@ -215,7 +215,7 @@ void ComboBox::mouseDown(wxMouseEvent &event)
} else if (drop.HasDismissLongTime()) { } else if (drop.HasDismissLongTime()) {
drop.autoPosition(); drop.autoPosition();
drop_down = true; drop_down = true;
drop.Show(); // Popup() will hung on MacOS drop.Popup();
wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN); wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN);
GetEventHandler()->ProcessEvent(e); GetEventHandler()->ProcessEvent(e);
} }
@ -242,7 +242,7 @@ void ComboBox::keyDown(wxKeyEvent& event) {
} else if (drop.HasDismissLongTime()) { } else if (drop.HasDismissLongTime()) {
drop.autoPosition(); drop.autoPosition();
drop_down = true; drop_down = true;
drop.Show(); // Popup() will hung on MacOS drop.Popup();
wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN); wxCommandEvent e(wxEVT_COMBOBOX_DROPDOWN);
GetEventHandler()->ProcessEvent(e); GetEventHandler()->ProcessEvent(e);
} }

11
src/slic3r/GUI/Widgets/DropDown.cpp
View file

@ -3,7 +3,7 @@
#include <wx/dcgraph.h> #include <wx/dcgraph.h>
BEGIN_EVENT_TABLE(DropDown, wxPanel) BEGIN_EVENT_TABLE(DropDown, wxPopupTransientWindow)
EVT_LEFT_DOWN(DropDown::mouseDown) EVT_LEFT_DOWN(DropDown::mouseDown)
EVT_LEFT_UP(DropDown::mouseReleased) EVT_LEFT_UP(DropDown::mouseReleased)
@ -46,14 +46,6 @@ DropDown::DropDown(wxWindow * parent,
// BBS set default font // BBS set default font
SetFont(Label::Body_14); SetFont(Label::Body_14);
#ifdef __WXOSX__
Bind(wxEVT_ACTIVATE, [this](auto & e) {
if (!e.GetActive()) {
Hide();
OnDismiss();
}
});
#endif
} }
void DropDown::Invalidate(bool clear) void DropDown::Invalidate(bool clear)
@ -373,6 +365,7 @@ void DropDown::mouseReleased(wxMouseEvent& event)
pressedDown = false; pressedDown = false;
if (hover_item >= 0) // not moved if (hover_item >= 0) // not moved
sendDropDownEvent(); sendDropDownEvent();
DismissAndNotify();
} }
} }