juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the event should be skipped, so that the CheckBox could be toggled

Browse Source 
JIRA: [STUDIO-14861]
Change-Id: I72e9e77c0e81e9cf64de7258ca09c225d5c3f807
(cherry picked from commit 9861c3d6bcd7e2720d1fccaacb820e13b5d7adb7)
This commit is contained in:
xin.zhang
2025-09-25 11:07:45 +08:00
committed by Noisyfox
parent f2996a529b
commit ff1e48a9c4
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/CreatePresetsDialog.cpp
View File

@@ -838,6 +838,8 @@ wxBoxSizer *CreateFilamentPresetDialog::create_vendor_item()
Refresh(); Refresh();
Layout(); Layout();
Fit(); Fit();
e.Skip();
}); });
comboBoxSizer->Add(vendor_sizer, 0, wxEXPAND | wxTOP, FromDIP(5)); comboBoxSizer->Add(vendor_sizer, 0, wxEXPAND | wxTOP, FromDIP(5));
@@ -1842,6 +1844,8 @@ wxBoxSizer *CreatePrinterPresetDialog::create_printer_item(wxWindow *parent)
Layout(); Layout();
m_page1->SetSizerAndFit(m_page1_sizer); m_page1->SetSizerAndFit(m_page1_sizer);
Fit(); Fit();
e.Skip();
}); });
vertical_sizer->Add(checkbox_sizer, 0, wxEXPAND | wxTOP, FromDIP(5)); vertical_sizer->Add(checkbox_sizer, 0, wxEXPAND | wxTOP, FromDIP(5));
@@ -1920,6 +1924,8 @@ wxBoxSizer *CreatePrinterPresetDialog::create_nozzle_diameter_item(wxWindow *par
Layout(); Layout();
m_page1->SetSizerAndFit(m_page1_sizer); m_page1->SetSizerAndFit(m_page1_sizer);
Fit(); Fit();
e.Skip();
}); });
vertical_sizer->Add(checkbox_sizer, 0, wxEXPAND | wxTOP, FromDIP(5)); vertical_sizer->Add(checkbox_sizer, 0, wxEXPAND | wxTOP, FromDIP(5));

2
src/slic3r/GUI/FilamentMapDialog.cpp
View File

@@ -274,6 +274,8 @@ void FilamentMapDialog::on_checkbox(wxCommandEvent &event)
dialog.ShowModal(); dialog.ShowModal();
this->Close(); this->Close();
} }
event.Skip();
} }
void FilamentMapDialog::on_ok(wxCommandEvent &event) void FilamentMapDialog::on_ok(wxCommandEvent &event)

2
src/slic3r/GUI/SyncAmsInfoDialog.cpp
View File

@@ -933,6 +933,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
auto flag = wxGetApp().app_config->get_bool("enable_append_color_by_sync_ams"); auto flag = wxGetApp().app_config->get_bool("enable_append_color_by_sync_ams");
wxGetApp().app_config->set_bool("enable_append_color_by_sync_ams",!flag); wxGetApp().app_config->set_bool("enable_append_color_by_sync_ams",!flag);
m_append_color_checkbox->SetValue(!flag); m_append_color_checkbox->SetValue(!flag);
e.Skip();
}); });
m_append_color_checkbox->Hide(); m_append_color_checkbox->Hide();
m_append_color_sizer->Add(m_append_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(4)); m_append_color_sizer->Add(m_append_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(4));
@@ -953,6 +954,7 @@ SyncAmsInfoDialog::SyncAmsInfoDialog(wxWindow *parent, SyncInfo &info) :
auto flag = wxGetApp().app_config->get_bool("enable_merge_color_by_sync_ams"); auto flag = wxGetApp().app_config->get_bool("enable_merge_color_by_sync_ams");
wxGetApp().app_config->set_bool("enable_merge_color_by_sync_ams",!flag); wxGetApp().app_config->set_bool("enable_merge_color_by_sync_ams",!flag);
m_merge_color_checkbox->SetValue(!flag); m_merge_color_checkbox->SetValue(!flag);
e.Skip();
}); });
m_merge_color_checkbox->Hide(); m_merge_color_checkbox->Hide();
m_merge_color_sizer->Add(m_merge_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(2)); m_merge_color_sizer->Add(m_merge_color_checkbox, 0, wxALIGN_LEFT | wxTOP, FromDIP(2));