mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: calibration page button broken display issue 

jira: STUDIO-3913

Change-Id: I2fd488e829d898b7d81d09db814ed6518f0c54a8
This commit is contained in:
liz.li 2024-03-19 10:26:30 +08:00 committed by Lane.Wei
parent 3040816e3a
commit 9f4b77da41
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/GUI/CalibrationWizard.cpp
View File

@ -90,6 +90,28 @@ CalibrationWizard::CalibrationWizard(wxWindow* parent, CalibMode mode, wxWindowI
main_sizer->Fit(this); main_sizer->Fit(this);
Bind(EVT_CALIBRATION_JOB_FINISHED, &CalibrationWizard::on_cali_job_finished, this); Bind(EVT_CALIBRATION_JOB_FINISHED, &CalibrationWizard::on_cali_job_finished, this);
#if !BBL_RELEASE_TO_PUBLIC
this->Bind(wxEVT_CHAR_HOOK, [this](auto& evt) {
const int keyCode = evt.GetKeyCode();
switch (keyCode)
{
case WXK_PAGEUP:
{
show_step(m_curr_step->prev);
break;
}
case WXK_PAGEDOWN:
{
show_step(m_curr_step->next);
break;
}
default:
evt.Skip();
break;
}
});
#endif
} }
CalibrationWizard::~CalibrationWizard() CalibrationWizard::~CalibrationWizard()

5
src/slic3r/GUI/CalibrationWizardCaliPage.cpp
View File

@ -21,6 +21,7 @@ CalibrationCaliPage::CalibrationCaliPage(wxWindow* parent, CalibMode cali_mode,
create_page(this); create_page(this);
this->SetSizer(m_top_sizer); this->SetSizer(m_top_sizer);
Layout();
m_top_sizer->Fit(this); m_top_sizer->Fit(this);
} }
@ -63,8 +64,6 @@ void CalibrationCaliPage::create_page(wxWindow* parent)
m_printing_panel->get_pause_resume_button()->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_pause_resume), NULL, this); m_printing_panel->get_pause_resume_button()->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_pause_resume), NULL, this);
m_printing_panel->get_abort_button()->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_abort), NULL, this); m_printing_panel->get_abort_button()->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_abort), NULL, this);
Layout();
} }
void CalibrationCaliPage::on_subtask_pause_resume(wxCommandEvent& event) void CalibrationCaliPage::on_subtask_pause_resume(wxCommandEvent& event)
@ -395,6 +394,7 @@ void CalibrationCaliPage::update_subtask(MachineObject* obj)
} }
this->Layout(); this->Layout();
this->Fit();
} }
void CalibrationCaliPage::update_basic_print_data(bool def, float weight, int prediction) void CalibrationCaliPage::update_basic_print_data(bool def, float weight, int prediction)
@ -424,6 +424,7 @@ void CalibrationCaliPage::reset_printing_values()
m_printing_panel->update_layers_num(true, wxString::Format(_L("Layer: %s"), NA_STR)); m_printing_panel->update_layers_num(true, wxString::Format(_L("Layer: %s"), NA_STR));
update_basic_print_data(false); update_basic_print_data(false);
this->Layout(); this->Layout();
this->Fit();
} }
void CalibrationCaliPage::on_device_connected(MachineObject* obj) void CalibrationCaliPage::on_device_connected(MachineObject* obj)