mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
FIX: [STUDIO-2186] hide PopupWindow on alt-tab
Change-Id: Ie1bffdd9ace2c6e05979743da9f75ca2c1e87cf4 (cherry picked from commit 7ddaf5260df19c76fca82e525caca26e55732fa9)
This commit is contained in:
parent
5f69f4c016
commit
a03dc779b6
23 changed files with 143 additions and 70 deletions
|
@ -12,9 +12,9 @@
|
|||
namespace Slic3r {
|
||||
namespace GUI {
|
||||
|
||||
wxIMPLEMENT_CLASS(CameraPopup, wxPopupTransientWindow);
|
||||
wxIMPLEMENT_CLASS(CameraPopup, PopupWindow);
|
||||
|
||||
wxBEGIN_EVENT_TABLE(CameraPopup, wxPopupTransientWindow)
|
||||
wxBEGIN_EVENT_TABLE(CameraPopup, PopupWindow)
|
||||
EVT_MOUSE_EVENTS(CameraPopup::OnMouse )
|
||||
EVT_SIZE(CameraPopup::OnSize)
|
||||
EVT_SET_FOCUS(CameraPopup::OnSetFocus )
|
||||
|
@ -29,7 +29,7 @@ wxDEFINE_EVENT(EVT_SDCARD_ABSENT_HINT, wxCommandEvent);
|
|||
const wxColour TEXT_COL = wxColour(43, 52, 54);
|
||||
|
||||
CameraPopup::CameraPopup(wxWindow *parent, MachineObject* obj)
|
||||
: wxPopupTransientWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS),
|
||||
: PopupWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS),
|
||||
m_obj(obj)
|
||||
{
|
||||
#ifdef __WINDOWS__
|
||||
|
@ -165,7 +165,7 @@ void CameraPopup::Popup(wxWindow *WXUNUSED(focus))
|
|||
this->SetPosition(curr_position);
|
||||
|
||||
if (!m_is_in_interval)
|
||||
wxPopupTransientWindow::Popup();
|
||||
PopupWindow::Popup();
|
||||
}
|
||||
|
||||
wxWindow* CameraPopup::create_item_radiobox(wxString title, wxWindow* parent, wxString tooltip, int padding_left)
|
||||
|
@ -347,7 +347,7 @@ void CameraPopup::rescale()
|
|||
m_panel->Layout();
|
||||
main_sizer->Fit(m_panel);
|
||||
SetClientSize(m_panel->GetSize());
|
||||
wxPopupTransientWindow::Update();
|
||||
PopupWindow::Update();
|
||||
}
|
||||
|
||||
void CameraPopup::OnLeftUp(wxMouseEvent &event)
|
||||
|
@ -409,18 +409,18 @@ void CameraPopup::stop_interval(wxTimerEvent& event)
|
|||
}
|
||||
|
||||
void CameraPopup::OnDismiss() {
|
||||
wxPopupTransientWindow::OnDismiss();
|
||||
PopupWindow::OnDismiss();
|
||||
this->start_interval();
|
||||
}
|
||||
|
||||
bool CameraPopup::ProcessLeftDown(wxMouseEvent &event)
|
||||
{
|
||||
return wxPopupTransientWindow::ProcessLeftDown(event);
|
||||
return PopupWindow::ProcessLeftDown(event);
|
||||
}
|
||||
|
||||
bool CameraPopup::Show(bool show)
|
||||
{
|
||||
return wxPopupTransientWindow::Show(show);
|
||||
return PopupWindow::Show(show);
|
||||
}
|
||||
|
||||
void CameraPopup::OnSize(wxSizeEvent &event)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue