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

Custom control : Fixed color of the colored label, associated with option, which doesn't have a corresponded field

Browse source
This commit is contained in:
YuSanka 2020-10-22 13:02:17 +02:00 • committed by Oleksandra Yushchenko
parent 7022fb0891
commit 534a2f5d33
5 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/slic3r/GUI/Tab.cpp
View file

@ -492,6 +492,10 @@ void Tab::update_labels_colour()
label->SetForegroundColour(*color);
label->Refresh(true);
}
if (m_colored_Label_colors.find(opt.first) != m_colored_Label_colors.end())
*m_colored_Label_colors.at(opt.first) = *color;
continue;
}
@ -528,13 +532,17 @@ void Tab::decorate()
wxStaticText* label = nullptr;
Field* field = nullptr;
if (opt.first == "bed_shape" || opt.first == "filament_ramming_parameters" ||
opt.first == "compatible_prints" || opt.first == "compatible_printers")
label = (m_colored_Labels.find(opt.first) == m_colored_Labels.end()) ? nullptr : m_colored_Labels.at(opt.first);
wxColour* colored_label_clr = nullptr;
if (!label)
if (opt.first == "bed_shape" || opt.first == "filament_ramming_parameters" ||
opt.first == "compatible_prints" || opt.first == "compatible_printers") {
label = (m_colored_Labels.find(opt.first) == m_colored_Labels.end()) ? nullptr : m_colored_Labels.at(opt.first);
colored_label_clr = (m_colored_Label_colors.find(opt.first) == m_colored_Label_colors.end()) ? nullptr : m_colored_Label_colors.at(opt.first);
}
if (!label && !colored_label_clr)
field = get_field(opt.first);
if (!label && !field)
if (!label && !colored_label_clr && !field)
continue;
bool is_nonsys_value = false;
@ -571,6 +579,11 @@ void Tab::decorate()
label->Refresh(true);
continue;
}
if (colored_label_clr) {
*colored_label_clr = *color;
continue;
}
field->m_is_nonsys_value = is_nonsys_value;
field->m_is_modified_value = is_modified_value;
@ -3498,6 +3511,10 @@ void Tab::create_line_with_widget(ConfigOptionsGroup* optgroup, const std::strin
m_colored_Labels[opt_key] = nullptr;
line.full_Label = &m_colored_Labels[opt_key];
m_colored_Label_colors[opt_key] = &m_default_text_clr;
line.full_Label_color = m_colored_Label_colors[opt_key];
optgroup->append_line(line);
}