From 5f4f859337d59b67f86baf35bf7980dc1083e442 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Mon, 1 Aug 2022 19:38:46 +0800 Subject: [PATCH] FIX: button deflate border on MacOS Change-Id: I5993ff5f56662758a5ffb9d5316bc1b4bce7f25b --- src/slic3r/GUI/Widgets/StaticBox.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp index fe282ffb2..f8c55919c 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.cpp +++ b/src/slic3r/GUI/Widgets/StaticBox.cpp @@ -148,7 +148,7 @@ void StaticBox::doRender(wxDC& dc) if (background_color2.count() == 0) { if ((border_width && border_color.count() > 0) || background_color.count() > 0) { wxRect rc(0, 0, size.x, size.y); - if (border_width && border_color.count() > 0) { + if (border_width && border_color.count() > 0 && (GetWindowStyle() & wxBORDER_NONE) == 0) { #ifdef __WXOSX__ int d = ceil(border_width / 2.0); rc.Deflate(d, d); @@ -158,8 +158,6 @@ void StaticBox::doRender(wxDC& dc) dc.SetPen(wxPen(background_color.colorForStates(states))); } dc.SetBrush(wxBrush(background_color.colorForStates(states))); - if (GetWindowStyle() & wxBORDER_NONE) - dc.SetPen(wxPen(background_color.colorForStates(states))); if (radius == 0) { dc.DrawRectangle(rc); }