From 86f270a861c1d6d69329ce8544c5fc85161620bb Mon Sep 17 00:00:00 2001 From: supermerill Date: Sun, 8 Aug 2021 01:45:44 +0200 Subject: [PATCH] fix merge --- src/slic3r/GUI/MainFrame.cpp | 1 - src/slic3r/GUI/PresetComboBoxes.cpp | 4 ++-- src/slic3r/GUI/Tab.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index a5469e004..a5f9cae25 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -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(); diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index 2dd46cfc9..d5ac676a9 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -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); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index fc72aec4f..b996c327d 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -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) {