juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-22 00:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/filament_id

Browse Source
This commit is contained in:
SoftFever
2026-09-03 12:16:38 +08:00
parent e2b251c145 e6501bb1ce
commit fa8edd0f69
122 changed files with 5361 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/PresetComboBoxes.cpp
+2 -2
View File
@@ -1660,7 +1660,7 @@ void TabPresetComboBox::OnSelect(wxCommandEvent &evt)
default: break;
}
if (sp != ConfigWizard::SP_WELCOME) {
wxTheApp->CallAfter([this, sp]() {
wxTheApp->CallAfter([sp]() {
run_wizard(sp);
});
}
@@ -1956,7 +1956,7 @@ GUI::CalibrateFilamentComboBox::CalibrateFilamentComboBox(wxWindow *parent)
{
clr_picker->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
clr_picker->SetToolTip("");
clr_picker->Bind(wxEVT_BUTTON, [this](wxCommandEvent& e) {});
clr_picker->Bind(wxEVT_BUTTON, [](wxCommandEvent& e) {});
}
GUI::CalibrateFilamentComboBox::~CalibrateFilamentComboBox()