From 8c862ade2936c8989eef01373dfc09013738a3de Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Fri, 17 May 2019 19:11:11 +0200 Subject: [PATCH] Revert 6b379428d4e0b053fd07292d9889f35cb51f3f44 --- src/slic3r/GUI/wxExtensions.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index a5b7eaa5b..fa8942c54 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -2656,15 +2656,8 @@ ScalableButton::ScalableButton( wxWindow * parent, if (style & wxNO_BORDER) SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); #endif // __WXMSW__ - - /* #FIXME Edit preset Buttons under OSX. - * Because of _strange_ layout of a Button with a scaled Bitmap on nonactive wxWindow, - * there is just temporary workaround. - * Send to create_scaled_bitmap(nullptr,...) for buttons without text => - * Bitmaps for this Buttons wouldn't be scaled and would be some blurred now, but - * they would be correctly updated on Plater - */ - SetBitmap(create_scaled_bitmap(label.IsEmpty() ? nullptr : parent, icon_name)); + + SetBitmap(create_scaled_bitmap(parent, icon_name)); }