diff --git a/src/GUI/MainFrame.cpp b/src/GUI/MainFrame.cpp index 80d949b85..9cc5cba6b 100644 --- a/src/GUI/MainFrame.cpp +++ b/src/GUI/MainFrame.cpp @@ -84,7 +84,7 @@ void MainFrame::init_tabpanel() auto tabpanel = this->tabpanel; // TODO: trigger processing for activation event if (tabpanel->GetSelection() > 1) { - tabpanel->SetWindowStyle(tabpanel->GetWindowStyleFlag() | wxAUI_NB_CLOSE_ON_ACTIVE_TAB); + tabpanel->SetWindowStyle(tabpanel->GetWindowStyleFlag()); } else if (ui_settings->show_host == false && tabpanel->GetSelection() == 1) { tabpanel->SetWindowStyle(tabpanel->GetWindowStyleFlag() | wxAUI_NB_CLOSE_ON_ACTIVE_TAB); } else { @@ -105,6 +105,11 @@ void MainFrame::init_tabpanel() panel->AddPage(this->plater, this->plater->GetName()); if (ui_settings->show_host) panel->AddPage(this->controller, this->controller->GetName()); + if (ui_settings->preset_editor_tabs) { + this->plater->show_preset_editor(preset_t::Print,0); + this->plater->show_preset_editor(preset_t::Material,0); + this->plater->show_preset_editor(preset_t::Printer,0); + } } diff --git a/src/GUI/Plater.hpp b/src/GUI/Plater.hpp index a88c2999e..992b37967 100644 --- a/src/GUI/Plater.hpp +++ b/src/GUI/Plater.hpp @@ -116,6 +116,7 @@ public: Preset* selected_presets(preset_t preset); /// Return a reference to all currently selected presets. std::vector selected_presets(); + void show_preset_editor(preset_t preset, unsigned int idx); private: std::shared_ptr print {std::make_shared(Slic3r::Print())}; std::shared_ptr model {std::make_shared(Slic3r::Model())}; @@ -260,7 +261,6 @@ private: std::vector preset_choosers {preset_types, nullptr}; void _on_change_combobox(preset_t preset, wxBitmapComboBox* choice); - void show_preset_editor(preset_t preset, unsigned int idx); void _on_select_preset(preset_t preset) {}; void load_presets();