GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-28 16:03:13 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

ENH:Extruder feed/retract popup size optimization

Browse Source 
jira:[STUDIO-12217]

Change-Id: I69f55f129408039952524753a67b15869f670214
This commit is contained in:
milk 2025-05-16 18:02:08 +08:00 committed by lane.wei
parent 7e8db714d4
commit d3ac9a4b9d
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/StatusPanel.cpp
View File

@ -3976,13 +3976,17 @@ void StatusPanel::on_axis_ctrl_z_down_10(wxCommandEvent &event)
void StatusPanel::axis_ctrl_e_hint(bool up_down) void StatusPanel::axis_ctrl_e_hint(bool up_down)
{ {
if (ctrl_e_hint_dlg == nullptr) { if (ctrl_e_hint_dlg == nullptr) {
ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition, wxDefaultSize, wxCLOSE_BOX, true); /* ctrl_e_hint_dlg = new SecondaryCheckDialog(this->GetParent(), wxID_ANY, _L("Warning"), SecondaryCheckDialog::ButtonStyle::CONFIRM_AND_CANCEL, wxDefaultPosition,
ctrl_e_hint_dlg->update_text(_L("Please heat the nozzle to above 170 degree before loading or unloading filament.")); wxDefaultSize, wxCLOSE_BOX, true); ctrl_e_hint_dlg->update_text(_L("Please heat the nozzle to above 170 degree before loading or unloading filament."));
ctrl_e_hint_dlg->m_show_again_checkbox->Hide(); ctrl_e_hint_dlg->m_show_again_checkbox->Hide();
ctrl_e_hint_dlg->m_button_cancel->Hide(); ctrl_e_hint_dlg->m_button_cancel->Hide();
ctrl_e_hint_dlg->m_staticText_release_note->SetMaxSize(wxSize(FromDIP(360), -1));
ctrl_e_hint_dlg->m_staticText_release_note->SetMinSize(wxSize(FromDIP(360), -1));
ctrl_e_hint_dlg->Fit();*/
ctrl_e_hint_dlg = new MessageDialog(this, _L("Please heat the nozzle to above 170 degree before loading or unloading filament."), wxString(_L("Warning")), wxOK | wxCENTER);
} }
ctrl_e_hint_dlg->ShowModal();
ctrl_e_hint_dlg->on_show(); // ctrl_e_hint_dlg->on_show();
} }
void StatusPanel::on_axis_ctrl_e_up_10(wxCommandEvent &event) void StatusPanel::on_axis_ctrl_e_up_10(wxCommandEvent &event)
@ -4964,7 +4968,7 @@ void StatusPanel::on_camera_enter(wxMouseEvent& event)
}); });
wxWindow* ctrl = (wxWindow*)event.GetEventObject(); wxWindow* ctrl = (wxWindow*)event.GetEventObject();
wxPoint pos = ctrl->ClientToScreen(wxPoint(0, 0)); wxPoint pos = ctrl->ClientToScreen(wxPoint(0, 0));
wxSize sz = ctrl->GetSize(); wxSize sz = ctrl->GetSize();
pos.x += sz.x; pos.x += sz.x;
pos.y += sz.y; pos.y += sz.y;
m_camera_popup->SetPosition(pos); m_camera_popup->SetPosition(pos);

3
src/slic3r/GUI/StatusPanel.hpp
View File

@ -606,7 +606,8 @@ protected:
SecondaryCheckDialog* m_print_error_dlg_no_action = nullptr; SecondaryCheckDialog* m_print_error_dlg_no_action = nullptr;
SecondaryCheckDialog* abort_dlg = nullptr; SecondaryCheckDialog* abort_dlg = nullptr;
SecondaryCheckDialog* con_load_dlg = nullptr; SecondaryCheckDialog* con_load_dlg = nullptr;
SecondaryCheckDialog* ctrl_e_hint_dlg = nullptr; MessageDialog * ctrl_e_hint_dlg = nullptr;
SecondaryCheckDialog* sdcard_hint_dlg = nullptr; SecondaryCheckDialog* sdcard_hint_dlg = nullptr;
SecondaryCheckDialog* axis_go_home_dlg = nullptr; SecondaryCheckDialog* axis_go_home_dlg = nullptr;