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: Revert "[STUDIO-2186] hide PopupWindow on alt-tab"

Browse source 
This reverts commit 3b8c11659a6cf3062ad27772348b84be5001a4f6.

Reason for revert: update pick

Change-Id: Id991af5b4a5950ee76ecf59176eabc72c885db88
This commit is contained in:
战马 2023-02-15 12:03:38 +08:00 • committed by Lane.Wei
parent 5c61c834b0
commit 5f69f4c016
23 changed files with 70 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/CameraPopup.cpp
View file

@ -12,9 +12,9 @@
namespace Slic3r {
namespace GUI {
wxIMPLEMENT_CLASS(CameraPopup, PopupWindow);
wxIMPLEMENT_CLASS(CameraPopup, wxPopupTransientWindow);
wxBEGIN_EVENT_TABLE(CameraPopup, PopupWindow)
wxBEGIN_EVENT_TABLE(CameraPopup, wxPopupTransientWindow)
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)
: PopupWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS),
: wxPopupTransientWindow(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)
PopupWindow::Popup();
wxPopupTransientWindow::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());
PopupWindow::Update();
wxPopupTransientWindow::Update();
}
void CameraPopup::OnLeftUp(wxMouseEvent &event)
@ -409,18 +409,18 @@ void CameraPopup::stop_interval(wxTimerEvent& event)
}
void CameraPopup::OnDismiss() {
PopupWindow::OnDismiss();
wxPopupTransientWindow::OnDismiss();
this->start_interval();
}
bool CameraPopup::ProcessLeftDown(wxMouseEvent &event)
{
return PopupWindow::ProcessLeftDown(event);
return wxPopupTransientWindow::ProcessLeftDown(event);
}
bool CameraPopup::Show(bool show)
{
return PopupWindow::Show(show);
return wxPopupTransientWindow::Show(show);
}
void CameraPopup::OnSize(wxSizeEvent &event)