Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_bug_fixes

This commit is contained in:
Enrico Turri 2019-02-04 13:03:38 +01:00
commit e0a97ce019

View File

@ -497,13 +497,15 @@ void TabSLAMaterial::init_options_list()
void Tab::get_sys_and_mod_flags(const std::string& opt_key, bool& sys_page, bool& modified_page)
{
auto opt = m_options_list.find(opt_key);
auto opt = m_options_list.find(opt_key);
if (sys_page) sys_page = (opt->second & osSystemValue) != 0;
modified_page |= (opt->second & osInitValue) == 0;
}
void Tab::update_changed_tree_ui()
{
if (m_options_list.empty())
return;
auto cur_item = m_treectrl->GetFirstVisibleItem();
if (!cur_item || !m_treectrl->IsVisible(cur_item))
return;
@ -689,9 +691,9 @@ void Tab::update_visibility()
Thaw();
// to update tree items color
wxTheApp->CallAfter([this]() {
// wxTheApp->CallAfter([this]() {
update_changed_tree_ui();
});
// });
}
Field* Tab::get_field(const t_config_option_key& opt_key, int opt_index/* = -1*/) const