mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-19 19:33:47 +00:00
FIX: Allow white color selection in default color picker
jira: STUDIO-13666 Change-Id: Ia2f5d8a1830a14d519c9277a88148a723f3d1be0 (cherry picked from commit fccfee6208c5ddc0552004d0642771f99f10dd67)
This commit is contained in:
@@ -1432,11 +1432,9 @@ FilamentColor PlaterPresetComboBox::get_cur_color_info()
|
|||||||
void PlaterPresetComboBox::show_default_color_picker()
|
void PlaterPresetComboBox::show_default_color_picker()
|
||||||
{
|
{
|
||||||
wxColourData data = show_sys_picker_dialog(this, m_clrData);
|
wxColourData data = show_sys_picker_dialog(this, m_clrData);
|
||||||
if(m_clrData.GetColour() != data.GetColour()) {
|
std::vector<std::string> color = {data.GetColour().GetAsString(wxC2S_HTML_SYNTAX).ToStdString()};
|
||||||
std::vector<std::string> color = {data.GetColour().GetAsString(wxC2S_HTML_SYNTAX).ToStdString()};
|
m_clrData.SetColour(data.GetColour());
|
||||||
m_clrData.SetColour(data.GetColour());
|
sync_colour_config(color, false);
|
||||||
sync_colour_config(color, false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlaterPresetComboBox::sync_colour_config(const std::vector<std::string> &clrs, bool is_gradient)
|
void PlaterPresetComboBox::sync_colour_config(const std::vector<std::string> &clrs, bool is_gradient)
|
||||||
|
|||||||
Reference in New Issue
Block a user