Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix calibration tab when switching between BBL&non-BBL printers #6661

Merged
merged 2 commits into from
Sep 7, 2024
Merged

Fix calibration tab when switching between BBL&non-BBL printers #6661

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c657084
Fix calibration tab when switching between BBL&non-BBL printers (Soft…
Noisyfox Sep 6, 2024
6a592f3
Merge branch 'main' into bugfox/cali_tab
SoftFever Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/slic3r/GUI/MainFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down