3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 07:56:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

11
src/slic3r/GUI/AmsMappingPopup.hpp
View file

@ -34,7 +34,6 @@
#include "Widgets/CheckBox.hpp"
#include "Widgets/ComboBox.hpp"
#include "Widgets/ScrolledWindow.hpp"
#include "Widgets/PopupWindow.hpp"
#include <wx/simplebook.h>
#include <wx/hashmap.h>
@ -114,7 +113,7 @@ public:
void doRender(wxDC &dc);
};
class AmsMapingPopup : public PopupWindow
class AmsMapingPopup : public wxPopupTransientWindow
{
public:
AmsMapingPopup(wxWindow *parent);
@ -147,7 +146,7 @@ public:
std::vector<TrayData> parse_ams_mapping(std::map<std::string, Ams*> amsList);
};
class AmsMapingTipPopup : public PopupWindow
class AmsMapingTipPopup : public wxPopupTransientWindow
{
public:
AmsMapingTipPopup(wxWindow *parent);
@ -167,7 +166,7 @@ public:
wxStaticText * m_tip_disable_ams;
};
class AmsHumidityTipPopup : public PopupWindow
class AmsHumidityTipPopup : public wxPopupTransientWindow
{
public:
AmsHumidityTipPopup(wxWindow* parent);
@ -187,7 +186,7 @@ public:
Button* m_button_confirm;
};
class AmsTutorialPopup : public PopupWindow
class AmsTutorialPopup : public wxPopupTransientWindow
{
public:
Label* text_title;
@ -209,7 +208,7 @@ public:
};
class AmsIntroducePopup : public PopupWindow
class AmsIntroducePopup : public wxPopupTransientWindow
{
public:
bool is_enable_ams = {false};