Merge branch 'master' into fs_emboss

# Conflicts: # src/slic3r/GUI/GLCanvas3D.cpp
2022-11-23 12:58:45 +01:00 · 2022-11-23 12:58:45 +01:00 · 48d4da5872
commit 48d4da5872
parent 4b23cbaffd d20131de49
7 changed files with 19 additions and 11 deletions
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@ -1409,7 +1409,7 @@ void ObjectManipulation::msw_rescale()
        editor->msw_rescale();

    // rescale "inches" checkbox
-    m_check_inch->SetMinSize(wxSize(-1, int(1.5f * m_check_inch->GetFont().GetPixelSize().y + 0.5f)));
+    m_check_inch->SetInitialSize(m_check_inch->GetBestSize());

    get_og()->msw_rescale();
 }