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

14
src/slic3r/GUI/SliceInfoPanel.cpp
View file

@ -11,9 +11,9 @@ namespace GUI {
#define ICON_SIZE (wxSize(FromDIP(16), FromDIP(16)))
#define PRINT_ICON_SIZE (wxSize(FromDIP(18), FromDIP(18)))
wxIMPLEMENT_CLASS(SliceInfoPopup, PopupWindow);
wxIMPLEMENT_CLASS(SliceInfoPopup, wxPopupTransientWindow);
wxBEGIN_EVENT_TABLE(SliceInfoPopup, PopupWindow)
wxBEGIN_EVENT_TABLE(SliceInfoPopup, wxPopupTransientWindow)
EVT_MOUSE_EVENTS( SliceInfoPopup::OnMouse )
EVT_SIZE(SliceInfoPopup::OnSize)
EVT_SET_FOCUS( SliceInfoPopup::OnSetFocus )
@ -53,7 +53,7 @@ static wxColour decode_color(const std::string &color)
SliceInfoPopup::SliceInfoPopup(wxWindow *parent, wxBitmap bmp, BBLSliceInfo *info)
: PopupWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS)
: wxPopupTransientWindow(parent, wxBORDER_NONE | wxPU_CONTAINS_CONTROLS)
{
#ifdef __WINDOWS__
SetDoubleBuffered(true);
@ -139,20 +139,20 @@ SliceInfoPopup::SliceInfoPopup(wxWindow *parent, wxBitmap bmp, BBLSliceInfo *inf
}
void SliceInfoPopup::Popup(wxWindow *WXUNUSED(focus)) {
PopupWindow::Popup();
wxPopupTransientWindow::Popup();
}
void SliceInfoPopup::OnDismiss() {
PopupWindow::OnDismiss();
wxPopupTransientWindow::OnDismiss();
}
bool SliceInfoPopup::ProcessLeftDown(wxMouseEvent &event)
{
return PopupWindow::ProcessLeftDown(event);
return wxPopupTransientWindow::ProcessLeftDown(event);
}
bool SliceInfoPopup::Show(bool show)
{
return PopupWindow::Show(show);
return wxPopupTransientWindow::Show(show);
}
void SliceInfoPopup::OnSize(wxSizeEvent &event)