From 9f4b77da415e7b052cae7017a23676cd7d2f2fe4 Mon Sep 17 00:00:00 2001
From: "liz.li" <liz.li@bambulab.com>
Date: Tue, 19 Mar 2024 10:26:30 +0800
Subject: [PATCH] FIX: calibration page button broken display issue

jira: STUDIO-3913

Change-Id: I2fd488e829d898b7d81d09db814ed6518f0c54a8
---
 src/slic3r/GUI/CalibrationWizard.cpp         | 22 ++++++++++++++++++++
 src/slic3r/GUI/CalibrationWizardCaliPage.cpp |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp
index 066210bbd..cb164cc78 100644
--- a/src/slic3r/GUI/CalibrationWizard.cpp
+++ b/src/slic3r/GUI/CalibrationWizard.cpp
@@ -90,6 +90,28 @@ CalibrationWizard::CalibrationWizard(wxWindow* parent, CalibMode mode, wxWindowI
     main_sizer->Fit(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()
diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
index a9c4ed285..cd63eaf38 100644
--- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp
@@ -21,6 +21,7 @@ CalibrationCaliPage::CalibrationCaliPage(wxWindow* parent, CalibMode cali_mode,
     create_page(this);
 
     this->SetSizer(m_top_sizer);
+    Layout();
     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_abort_button()->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CalibrationCaliPage::on_subtask_abort), NULL, this);
-
-    Layout();
 }
 
 void CalibrationCaliPage::on_subtask_pause_resume(wxCommandEvent& event)
@@ -395,6 +394,7 @@ void CalibrationCaliPage::update_subtask(MachineObject* obj)
     }
 
     this->Layout();
+    this->Fit();
 }
 
 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));
     update_basic_print_data(false);
     this->Layout();
+    this->Fit();
 }
 
 void CalibrationCaliPage::on_device_connected(MachineObject* obj)