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
Pantheon-Design · Oct 17, 2024 · 93c2ed7 · 93c2ed7
1 parent 366659e
commit 93c2ed7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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