3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 15:44:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer

Browse source
This commit is contained in:
Vojtech Bubnik 2021-02-04 13:06:11 +01:00
commit 52a3161018
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -76,6 +76,7 @@ static choice_ctrl* create_word_local_combo(wxWindow *parent)
void msw_rescale_word_local_combo(choice_ctrl* combo) void msw_rescale_word_local_combo(choice_ctrl* combo)
{ {
#ifdef __WXOSX__
const wxString selection = combo->GetString(combo->GetSelection()); const wxString selection = combo->GetString(combo->GetSelection());
/* To correct scaling (set new controll size) of a wxBitmapCombobox /* To correct scaling (set new controll size) of a wxBitmapCombobox
@ -97,6 +98,9 @@ void msw_rescale_word_local_combo(choice_ctrl* combo)
combo->Append(_L("Local coordinates")); combo->Append(_L("Local coordinates"));
combo->SetValue(selection); combo->SetValue(selection);
#else
combo->SetMinSize(wxSize(15 * wxGetApp().em_unit(), -1));
#endif
} }
static void set_font_and_background_style(wxWindow* win, const wxFont& font) static void set_font_and_background_style(wxWindow* win, const wxFont& font)