From e3c1716d7c483b38661a0cef5299f9a2501231c2 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Sat, 7 Sep 2024 17:09:10 +0800 Subject: [PATCH] Fix calibration tab when switching between BBL&non-BBL printers (#6661) * Fix calibration tab when switching between BBL&non-BBL printers (SoftFever/OrcaSlicer#6563) * Merge branch 'main' into bugfox/cali_tab --- src/slic3r/GUI/MainFrame.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 48212f45cb..23913779ca 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1104,7 +1104,9 @@ void MainFrame::show_device(bool bBBLPrinter) { m_calibration->SetBackgroundColour(*wxWHITE); } m_calibration->Show(false); - m_tabpanel->InsertPage(tpCalibration, m_calibration, _L("Calibration"), std::string("tab_calibration_active"), + // Calibration is always the last page, so don't use InsertPage here. Otherwise, if multi_machine page is not enabled, + // the calibration tab won't be properly added as well, due to the TabPosition::tpCalibration no longer matches the real tab position. + m_tabpanel->AddPage(m_calibration, _L("Calibration"), std::string("tab_calibration_active"), std::string("tab_calibration_active"), false); #ifdef _MSW_DARK_MODE