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

Fixing conflicts part 4:

Browse source 
See previous commit. This one applies changes from master_250
to the files mentioned
This commit is contained in:
Lukas Matena 2022-06-29 16:12:52 +02:00
parent d662bf2a18
commit 6c0db58628
10 changed files with 88 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/ConfigWizard.cpp
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
// FIXME: extract absolute units -> em
#include "ConfigWizard_private.hpp"
@ -1485,7 +1484,7 @@ PageDiameters::PageDiameters(ConfigWizard *parent)
auto *unit_filam = new wxStaticText(this, wxID_ANY, _L("mm"));
sizer_filam->AddGrowableCol(0, 1);
sizer_filam->Add(text_filam, 0, wxALIGN_CENTRE_VERTICAL);
sizer_filam->Add(diam_filam);
sizer_filam->Add(diam_filam, 0, wxALIGN_CENTRE_VERTICAL);
sizer_filam->Add(unit_filam, 0, wxALIGN_CENTRE_VERTICAL);
append(sizer_filam);
}