mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-04-06 00:32:05 +02:00
Fix \n not displayed (#11978)
This commit is contained in:
@@ -710,6 +710,13 @@ void TextCtrl::BUILD() {
|
|||||||
const ConfigOptionStrings *vec = m_opt.get_default_value<ConfigOptionStrings>();
|
const ConfigOptionStrings *vec = m_opt.get_default_value<ConfigOptionStrings>();
|
||||||
if (vec == nullptr || vec->empty()) break; //for the case of empty default value
|
if (vec == nullptr || vec->empty()) break; //for the case of empty default value
|
||||||
text_value = vec->get_at(m_opt_idx);
|
text_value = vec->get_at(m_opt_idx);
|
||||||
|
// For multiline fields, unescape newlines and other escape sequences
|
||||||
|
if (m_opt.multiline) {
|
||||||
|
std::string unescaped_value;
|
||||||
|
if (unescape_string_cstyle(text_value.ToStdString(), unescaped_value)) {
|
||||||
|
text_value = wxString::FromUTF8(unescaped_value);
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case coPoint:
|
case coPoint:
|
||||||
@@ -731,7 +738,7 @@ void TextCtrl::BUILD() {
|
|||||||
: builder2.build(m_parent, "", "", "", wxDefaultPosition, size, wxTE_PROCESS_ENTER);
|
: builder2.build(m_parent, "", "", "", wxDefaultPosition, size, wxTE_PROCESS_ENTER);
|
||||||
temp->SetLabel(_L(m_opt.sidetext));
|
temp->SetLabel(_L(m_opt.sidetext));
|
||||||
auto text_ctrl = m_opt.multiline ? (wxTextCtrl *)temp : ((TextInput *) temp)->GetTextCtrl();
|
auto text_ctrl = m_opt.multiline ? (wxTextCtrl *)temp : ((TextInput *) temp)->GetTextCtrl();
|
||||||
text_ctrl->SetLabel(text_value);
|
text_ctrl->SetValue(text_value);
|
||||||
temp->SetSize(size);
|
temp->SetSize(size);
|
||||||
m_combine_side_text = !m_opt.multiline;
|
m_combine_side_text = !m_opt.multiline;
|
||||||
if (parent_is_custom_ctrl && m_opt.height < 0)
|
if (parent_is_custom_ctrl && m_opt.height < 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user