diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp index 11da9db069..79b9f32d13 100644 --- a/src/slic3r/GUI/TabButton.cpp +++ b/src/slic3r/GUI/TabButton.cpp @@ -182,6 +182,7 @@ void TabButton::render(wxDC &dc) pt.y = (size.y - showimg.GetHeight()) / 2; dc.DrawBitmap(showimg, pt); } + } void TabButton::messureSize() diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp index f096fbe53c..9b6d793ccf 100644 --- a/src/slic3r/GUI/Widgets/Button.cpp +++ b/src/slic3r/GUI/Widgets/Button.cpp @@ -364,14 +364,6 @@ void Button::render(wxDC& dc) dc.SetBrush(*wxLIGHT_GREY); dc.SetPen(wxPen(*wxLIGHT_GREY)); dc.DrawRectangle(pt, textSize.GetSize()); -#endif -#ifdef __WXOSX__ - pt.y -= this->textSize.x / 2; -#endif -#ifdef __APPLE__ - if (Slic3r::is_mac_version_15()) { - pt.y -= FromDIP(1); - } #endif dc.DrawText(text, pt); } diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp index 7d600ef310..08c58309e5 100644 --- a/src/slic3r/GUI/Widgets/SideButton.cpp +++ b/src/slic3r/GUI/Widgets/SideButton.cpp @@ -278,13 +278,11 @@ void SideButton::dorender(wxDC& dc, wxDC& text_dc) auto text = GetLabel(); if (!text.IsEmpty()) { pt.y += (rcContent.height - textSize.y) / 2; -#ifdef __APPLE__ - pt.y -= FromDIP(2); -#endif text_dc.SetFont(GetFont()); text_dc.SetTextForeground(text_color.colorForStates(states)); text_dc.DrawText(text, pt); } + } void SideButton::messureSize()