GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-15 07:25:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
supermerill 2021-08-08 01:45:44 +02:00
parent f34a3b1a6f
commit 86f270a861
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -622,7 +622,6 @@ void MainFrame::change_tab(Tab* old_tab, Tab* new_tab)
}
m_tabpanel->InsertPage(page_id, new_tab, new_tab->title());
#ifdef __linux__ // the tabs apparently need to be explicitly shown on Linux (pull request #1563)
int page_id = m_tabpanel->FindPage(new_tab);
m_tabpanel->GetPage(page_id)->Show(true);
#endif // __linux__
MainFrame::update_icon();

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

@ -703,9 +703,9 @@ bool PlaterPresetComboBox::switch_to_tab()
wxGetApp().tab_panel()->SetSelection(page_id);
// Switch to Settings NotePad
if(m_type == Preset::Type::TYPE_PRINT || m_type == Preset::Type::TYPE_SLA_PRINT)
if(m_type == Preset::Type::TYPE_FFF_PRINT || m_type == Preset::Type::TYPE_SLA_PRINT)
wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrintSettings);
else if (m_type == Preset::Type::TYPE_FILAMENT || m_type == Preset::Type::TYPE_SLA_MATERIAL)
else if (m_type == Preset::Type::TYPE_FFF_FILAMENT || m_type == Preset::Type::TYPE_SLA_MATERIAL)
wxGetApp().mainframe->select_tab(MainFrame::ETabType::FilamentSettings);
else if (m_type == Preset::Type::TYPE_PRINTER)
wxGetApp().mainframe->select_tab(MainFrame::ETabType::PrinterSettings);

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

@ -3366,7 +3366,7 @@ void Tab::select_preset(std::string preset_name, bool delete_current /*=false*/,
load_current_preset();
// apply duplicate_distance for print preset
if (m_type == Preset::TYPE_PRINT) {
if (m_type == Preset::TYPE_FFF_PRINT || m_type == Preset::TYPE_SLA_PRINT) {
wxGetApp().mainframe->plater()->canvas3D()->set_arrange_settings(m_presets->get_edited_preset().config, m_presets->get_edited_preset().printer_technology());
}
if (m_type == Preset::TYPE_PRINTER) {