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

fix merge

Browse Source
This commit is contained in:
remi durand 2021-02-22 14:43:04 +01:00
parent a50b4cd544
commit 01a311572f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1777,9 +1777,9 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page)
if (!in_line) { if (!in_line) {
if (colored) { if (colored) {
m_colored_Label_colors[setting_id] = &m_default_text_clr; m_colored_Label_colors[setting_id] = m_default_text_clr;
Line l = current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path)); Line l = current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path));
l.full_Label_color = m_colored_Label_colors[setting_id]; l.full_Label_color = &m_colored_Label_colors[setting_id];
current_group->append_line(l); current_group->append_line(l);
} else { } else {
current_group->append_line(current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path))); current_group->append_line(current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path)));