3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removed SearchCombobox from the Sidebar.

Browse source 
Tab->SearchCombobox works with all parameters now.
Overridden GetWindow() for PointCtrl.
This commit is contained in:
YuSanka 2020-03-21 19:45:55 +01:00
parent 8898dd5618
commit ebfaf7abb0
5 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/slic3r/GUI/Plater.cpp
View file

@ -834,8 +834,8 @@ Sidebar::Sidebar(Plater *parent)
p->sizer_params->Add(p->frequently_changed_parameters->get_sizer(), 0, wxEXPAND | wxTOP | wxBOTTOM, wxOSX ? 1 : margin_5);
// Search combobox
p->search_cb = new SearchComboBox(p->scrolled);
p->sizer_params->Add(p->search_cb, 0, wxEXPAND | wxTOP | wxBOTTOM, wxOSX ? 1 : margin_5);
// p->search_cb = new SearchComboBox(p->scrolled);
// p->sizer_params->Add(p->search_cb, 0, wxEXPAND | wxTOP | wxBOTTOM, wxOSX ? 1 : margin_5);
// Object List
p->object_list = new ObjectList(p->scrolled);
@ -1362,7 +1362,21 @@ static std::vector<SearchInput> get_search_inputs(ConfigOptionMode mode)
void Sidebar::update_search_list()
{
p->search_cb->init(get_search_inputs(m_mode));
if (p->search_cb)
p->search_cb->init(get_search_inputs(m_mode));
std::vector<SearchInput> search_list{};
auto& tabs_list = wxGetApp().tabs_list;
auto print_tech = wxGetApp().preset_bundle->printers.get_selected_preset().printer_technology();
for (auto tab : tabs_list)
if (tab->supports_printer_technology(print_tech))
search_list.emplace_back(SearchInput{ tab->get_config(), tab->type(), m_mode });
for (auto tab : tabs_list)
if (tab->supports_printer_technology(print_tech))
tab->get_search_cb()->init(search_list);
}
void Sidebar::update_mode()