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

Merge branch 'main' into libvgcode

Browse Source
This commit is contained in:
Noisyfox
2025-11-22 19:35:32 +08:00
committed by GitHub
parent daf3038f2f 3367648ec0
commit 8d3b3645e7
25 changed files with 8998 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/MainFrame.cpp
View File

@@ -3454,10 +3454,6 @@ void MainFrame::load_config_file()
wxGetApp().app_config->update_config_dir(get_dir_name(cfiles.back()));
wxGetApp().load_current_presets();
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " presets has been import,and size is" << cfiles.size();
NetworkAgent* agent = wxGetApp().getAgent();
if (agent) {
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " user is: " << agent->get_user_id();
}
}
wxGetApp().preset_bundle->update_compatible(PresetSelectCompatibleType::Always);
update_side_preset_ui();

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

@@ -3235,8 +3235,8 @@ void Sidebar::on_full_screen(IntEvent &e) {
void Sidebar::get_big_btn_sync_pos_size(wxPoint &pt, wxSize &size)
{
size =btn_sync->GetSize();
pt = btn_sync->GetScreenPosition();
size = p->m_printer_bbl_sync->GetSize();
pt = p->m_printer_bbl_sync->GetScreenPosition();
}
void Sidebar::get_small_btn_sync_pos_size(wxPoint &pt, wxSize &size) {

2
src/slic3r/GUI/Plater.hpp
View File

@@ -127,7 +127,7 @@ public:
class Sidebar : public wxPanel
{
ConfigOptionMode m_mode;
Button * btn_sync{nullptr};
//Button * btn_sync{nullptr};
ScalableButton * ams_btn{nullptr};
bool m_last_slice_state = false;
SyncNozzleAndAmsDialog* m_sna_dialog{nullptr};