3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-18 05:45:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: use dialog instead of popup window

Browse source 
jira: [STUDIO-10692]
Change-Id: I85e8da120946fc6ff845c9b88d4f1594e313652b
(cherry picked from commit 7115c1ca177e98c2931517d748ce4d63d3a067da)
This commit is contained in:
xin.zhang 2025-03-05 16:04:39 +08:00 • committed by Noisyfox
parent 5807353e24
commit 740f7eabb1
3 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/StatusPanel.cpp
View file

@ -4824,7 +4824,7 @@ void StatusPanel::on_nozzle_fan_switch(wxCommandEvent &event)
}
m_fan_control_popup->SetPosition(pos);
m_fan_control_popup->Popup();
m_fan_control_popup->ShowModal();

11
src/slic3r/GUI/Widgets/FanControl.cpp
View file

@ -588,7 +588,7 @@ Description:FanControlPopupNew
**************************************************/
static void nop_deleter_fan_control_popup(FanControlPopupNew *) {}
FanControlPopupNew::FanControlPopupNew(wxWindow* parent, MachineObject* obj, const AirDuctData& data)
: PopupWindow(parent, wxBORDER_NONE)
: wxDialog(parent, wxID_ANY, wxEmptyString)
{
SetBackgroundColour(*wxWHITE);
init_names();
@ -848,10 +848,6 @@ void FanControlPopupNew::on_left_down(wxMouseEvent& evt)
evt.Skip();
}
void FanControlPopupNew::OnDismiss()
{
}
void FanControlPopupNew::post_event(int fan_type, wxString speed)
{
// id, speed
@ -863,11 +859,6 @@ void FanControlPopupNew::post_event(int fan_type, wxString speed)
event.Skip();
}
bool FanControlPopupNew::ProcessLeftDown(wxMouseEvent& event)
{
return PopupWindow::ProcessLeftDown(event);
}
void FanControlPopupNew::on_show(wxShowEvent& evt)
{
wxGetApp().UpdateDarkUIWin(this);

4
src/slic3r/GUI/Widgets/FanControl.hpp
View file

@ -174,7 +174,7 @@ public:
};
class FanControlPopupNew : public PopupWindow
class FanControlPopupNew : public wxDialog
{
public:
FanControlPopupNew(wxWindow* parent, MachineObject* obj, const AirDuctData& data);
@ -248,8 +248,6 @@ public:
void post_event(int fan_type, wxString speed);
void on_show(wxShowEvent& evt);
void command_control_air_duct(int mode_id);
virtual void OnDismiss() wxOVERRIDE;
virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE;
};
wxDECLARE_EVENT(EVT_FAN_SWITCH_ON, wxCommandEvent);
wxDECLARE_EVENT(EVT_FAN_SWITCH_OFF, wxCommandEvent);