From 172c1bbab7b1576b43ee2a6bdb7da8adc9736f61 Mon Sep 17 00:00:00 2001 From: YuSanka <yusanka@gmail.com> Date: Thu, 12 Nov 2020 21:43:21 +0100 Subject: [PATCH] Fix the typo in 932dfb4fcab6c3248a4015827018d1f4b5582d3a The resize of the Spincontrol was wrong placed in the code --- src/slic3r/GUI/Field.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 7c55989bf..bc6124b80 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -693,6 +693,11 @@ void SpinCtrl::BUILD() { auto temp = new wxSpinCtrl(m_parent, wxID_ANY, text_value, wxDefaultPosition, size, 0|wxTE_PROCESS_ENTER, min_val, max_val, default_value); +#ifdef __WXGTK3__ + wxSize best_sz = temp->GetBestSize(); + if (best_sz.x > size.x) + temp->SetSize(wxSize(size.x + 2 * best_sz.y, best_sz.y)); +#endif //__WXGTK3__ temp->SetFont(Slic3r::GUI::wxGetApp().normal_font()); if (!wxOSX) temp->SetBackgroundStyle(wxBG_STYLE_PAINT); @@ -1482,11 +1487,6 @@ void SliderCtrl::BUILD() m_textctrl = new wxTextCtrl(m_parent, wxID_ANY, wxString::Format("%d", m_slider->GetValue()/m_scale), wxDefaultPosition, field_size); -#ifdef __WXGTK3__ - wxSize best_sz = m_textctrl->GetBestSize(); - if (best_sz.x > size.x) - m_textctrl->SetSize(wxSize(size.x + 2 * best_sz.y, best_sz.y)); -#endif //__WXGTK3__ m_textctrl->SetFont(Slic3r::GUI::wxGetApp().normal_font()); m_textctrl->SetBackgroundStyle(wxBG_STYLE_PAINT);