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

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

Browse source
This commit is contained in:
bubnikv 2019-05-13 17:10:17 +02:00
commit f47839e824
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/wxExtensions.cpp
View file

@ -2491,7 +2491,6 @@ ModeButton::ModeButton( wxWindow * parent,
const wxString& mode /* = wxEmptyString*/, const wxString& mode /* = wxEmptyString*/,
const wxSize& size /* = wxDefaultSize*/, const wxSize& size /* = wxDefaultSize*/,
const wxPoint& pos /* = wxDefaultPosition*/) : const wxPoint& pos /* = wxDefaultPosition*/) :
// wxButton(parent, id, mode, pos, wxDefaultSize/*size*/, wxBU_EXACTFIT | wxNO_BORDER),
ScalableButton(parent, id, icon_name, mode, size, pos) ScalableButton(parent, id, icon_name, mode, size, pos)
{ {
m_tt_focused = wxString::Format(_(L("Switch to the %s mode")), mode); m_tt_focused = wxString::Format(_(L("Switch to the %s mode")), mode);
@ -2548,7 +2547,14 @@ ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 10*/) :
m_mode_btns.reserve(3); m_mode_btns.reserve(3);
for (const auto& button : buttons) { for (const auto& button : buttons) {
m_mode_btns.push_back(new ModeButton(parent, wxID_ANY, button.second, button.first)); #ifdef __WXOSX__
wxSize sz = parent->GetTextExtent(button.first);
// set default width for ModeButtons to correct rendering on OnFocus under OSX
sz.y += 2 * em_unit(parent);
m_mode_btns.push_back(new ModeButton(parent, wxID_ANY, button.second, button.first, sz));
#else
m_mode_btns.push_back(new ModeButton(parent, wxID_ANY, button.second, button.first));;
#endif // __WXOSX__
} }
for (auto btn : m_mode_btns) for (auto btn : m_mode_btns)