3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux specific: Fixed na_value for SpinCtrl.

Browse Source 
On Linux wxSpinCtrl can't get a text value other than empty string,
so we can't set "N/A" value and use it for check of the value after changes.
This commit is contained in:
YuSanka 2023-02-06 18:20:02 +01:00
parent 2b1bd627d7
commit 16535899be
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/Field.cpp
View File

@ -201,7 +201,14 @@ bool Field::is_matched(const std::string& string, const std::string& pattern)
return std::regex_match(string, regex_pattern); return std::regex_match(string, regex_pattern);
} }
static wxString na_value() { return _(L("N/A")); } static wxString na_value(bool for_spin_ctrl = false)
{
#ifdef __linux__
if (for_spin_ctrl)
return "";
#endif
return _(L("N/A"));
}
void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true*/) void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true*/)
{ {
@ -888,7 +895,7 @@ void SpinCtrl::set_value(const boost::any& value, bool change_event/* = false*/)
if (m_opt.nullable) { if (m_opt.nullable) {
const bool m_is_na_val = tmp_value == ConfigOptionIntsNullable::nil_value(); const bool m_is_na_val = tmp_value == ConfigOptionIntsNullable::nil_value();
if (m_is_na_val) if (m_is_na_val)
dynamic_cast<wxSpinCtrl*>(window)->SetValue(na_value()); dynamic_cast<wxSpinCtrl*>(window)->SetValue(na_value(true));
else { else {
m_last_meaningful_value = value; m_last_meaningful_value = value;
dynamic_cast<wxSpinCtrl*>(window)->SetValue(tmp_value); dynamic_cast<wxSpinCtrl*>(window)->SetValue(tmp_value);
@ -909,7 +916,7 @@ void SpinCtrl::set_last_meaningful_value()
void SpinCtrl::set_na_value() void SpinCtrl::set_na_value()
{ {
dynamic_cast<wxSpinCtrl*>(window)->SetValue(na_value()); dynamic_cast<wxSpinCtrl*>(window)->SetValue(na_value(true));
m_value = ConfigOptionIntsNullable::nil_value(); m_value = ConfigOptionIntsNullable::nil_value();
propagate_value(); propagate_value();
} }
@ -917,7 +924,7 @@ void SpinCtrl::set_na_value()
boost::any& SpinCtrl::get_value() boost::any& SpinCtrl::get_value()
{ {
wxSpinCtrl* spin = static_cast<wxSpinCtrl*>(window); wxSpinCtrl* spin = static_cast<wxSpinCtrl*>(window);
if (spin->GetTextValue() == na_value()) if (spin->GetTextValue() == na_value(true))
return m_value; return m_value;
int value = spin->GetValue(); int value = spin->GetValue();