3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-11 16:00:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

12
src/slic3r/GUI/Widgets/SideMenuPopup.cpp
View file

@ -6,12 +6,12 @@
wxBEGIN_EVENT_TABLE(SidePopup,PopupWindow)
wxBEGIN_EVENT_TABLE(SidePopup,wxPopupTransientWindow)
EVT_PAINT(SidePopup::paintEvent)
wxEND_EVENT_TABLE()
SidePopup::SidePopup(wxWindow* parent)
:PopupWindow(parent,
:wxPopupTransientWindow(parent,
wxBORDER_NONE |
wxPU_CONTAINS_CONTROLS)
{
@ -28,16 +28,16 @@ SidePopup::~SidePopup()
void SidePopup::OnDismiss()
{
Slic3r::GUI::wxGetApp().set_side_menu_popup_status(false);
PopupWindow::OnDismiss();
wxPopupTransientWindow::OnDismiss();
}
bool SidePopup::ProcessLeftDown(wxMouseEvent& event)
{
return PopupWindow::ProcessLeftDown(event);
return wxPopupTransientWindow::ProcessLeftDown(event);
}
bool SidePopup::Show( bool show )
{
return PopupWindow::Show(show);
return wxPopupTransientWindow::Show(show);
}
void SidePopup::Popup(wxWindow* focus)
@ -66,7 +66,7 @@ void SidePopup::Popup(wxWindow* focus)
Position(pos, {0, focus->GetSize().y + 12});
}
Slic3r::GUI::wxGetApp().set_side_menu_popup_status(true);
PopupWindow::Popup();
wxPopupTransientWindow::Popup();
}
void SidePopup::Create()