viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'main' into dev/bbl-network-upd

Browse Source
This commit is contained in:
Noisyfox
2025-05-09 23:03:47 +08:00
committed by GitHub
parent fe0f6497ad 0cc495b425
commit 4d25037614
22 changed files with 180 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/slic3r/GUI/Plater.cpp
View File

@@ -6412,7 +6412,7 @@ void Plater::priv::set_current_panel(wxPanel* panel, bool no_slice)
if (current_panel == view3D) {
if (old_panel == preview)
preview->get_canvas3d()->unbind_event_handlers();
else if (old_panel == assemble_view)
else if (old_panel == assemble_view) {
assemble_view->get_canvas3d()->unbind_event_handlers();
GLCanvas3D* assemble_canvas = assemble_view->get_canvas3d();
@@ -6426,6 +6426,7 @@ void Plater::priv::set_current_panel(wxPanel* panel, bool no_slice)
view3d_selection.add(real_idx, false);
}
}
}
view3D->get_canvas3d()->bind_event_handlers();
@@ -10881,12 +10882,13 @@ ProjectDropDialog::ProjectDropDialog(const std::string &filename)
m_sizer_main->Add(0, 0, 0, wxEXPAND | wxTOP, 10);
wxBoxSizer *m_sizer_bottom = new wxBoxSizer(wxHORIZONTAL);
wxBoxSizer *m_sizer_left = new wxBoxSizer(wxHORIZONTAL);
auto dont_show_again = create_remember_checkbox(_L("Remember my choice."), this, _L("This option can be changed later in preferences, under 'Load Behaviour'."));
m_sizer_left->Add(dont_show_again, 0, wxALL, 5);
m_sizer_bottom->Add(m_sizer_left, 0, wxEXPAND, 5);
// Orca: hide the "Don't show again" checkbox, people keeps accidentally checked this then forgot
// wxBoxSizer *m_sizer_left = new wxBoxSizer(wxHORIZONTAL);
//
// auto dont_show_again = create_remember_checkbox(_L("Remember my choice."), this, _L("This option can be changed later in preferences, under 'Load Behaviour'."));
// m_sizer_left->Add(dont_show_again, 0, wxALL, 5);
//
// m_sizer_bottom->Add(m_sizer_left, 0, wxEXPAND, 5);
m_sizer_bottom->Add(0, 0, 1, wxEXPAND, 5);
wxBoxSizer *m_sizer_right = new wxBoxSizer(wxHORIZONTAL);