juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 10:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

8
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -387,7 +387,7 @@ void MachineObjectPanel::on_mouse_left_up(wxMouseEvent &evt)
}
SelectMachinePopup::SelectMachinePopup(wxWindow *parent)
: PopupWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS), m_dismiss(false)
: wxPopupTransientWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS), m_dismiss(false)
{
#ifdef __WINDOWS__
SetDoubleBuffered(true);
@@ -481,7 +481,7 @@ void SelectMachinePopup::Popup(wxWindow *WXUNUSED(focus))
}
wxPostEvent(this, wxTimerEvent());
PopupWindow::Popup();
wxPopupTransientWindow::Popup();
}
void SelectMachinePopup::OnDismiss()
@@ -507,7 +507,7 @@ void SelectMachinePopup::OnDismiss()
}
bool SelectMachinePopup::ProcessLeftDown(wxMouseEvent &event) {
return PopupWindow::ProcessLeftDown(event);
return wxPopupTransientWindow::ProcessLeftDown(event);
}
bool SelectMachinePopup::Show(bool show) {
@@ -522,7 +522,7 @@ bool SelectMachinePopup::Show(bool show) {
m_other_list_machine_panel[j]->mPanel->Hide();
}
}
return PopupWindow::Show(show);
return wxPopupTransientWindow::Show(show);
}
wxWindow *SelectMachinePopup::create_title_panel(wxString text)