juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 03:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove macOS text position fudge factors (no longer needed with wx 3.3)

Browse Source
This commit is contained in:
SoftFever
2026-03-25 15:58:32 +08:00
parent f77e7d833b
commit 80c958d98b
3 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/TabButton.cpp
View File

@@ -182,6 +182,7 @@ void TabButton::render(wxDC &dc)
pt.y = (size.y - showimg.GetHeight()) / 2; pt.y = (size.y - showimg.GetHeight()) / 2;
dc.DrawBitmap(showimg, pt); dc.DrawBitmap(showimg, pt);
} }
} }
void TabButton::messureSize() void TabButton::messureSize()

8
src/slic3r/GUI/Widgets/Button.cpp
View File

@@ -364,14 +364,6 @@ void Button::render(wxDC& dc)
dc.SetBrush(*wxLIGHT_GREY); dc.SetBrush(*wxLIGHT_GREY);
dc.SetPen(wxPen(*wxLIGHT_GREY)); dc.SetPen(wxPen(*wxLIGHT_GREY));
dc.DrawRectangle(pt, textSize.GetSize()); 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 #endif
dc.DrawText(text, pt); dc.DrawText(text, pt);
} }

4
src/slic3r/GUI/Widgets/SideButton.cpp
View File

@@ -278,13 +278,11 @@ void SideButton::dorender(wxDC& dc, wxDC& text_dc)
auto text = GetLabel(); auto text = GetLabel();
if (!text.IsEmpty()) { if (!text.IsEmpty()) {
pt.y += (rcContent.height - textSize.y) / 2; pt.y += (rcContent.height - textSize.y) / 2;
#ifdef __APPLE__
pt.y -= FromDIP(2);
#endif
text_dc.SetFont(GetFont()); text_dc.SetFont(GetFont());
text_dc.SetTextForeground(text_color.colorForStates(states)); text_dc.SetTextForeground(text_color.colorForStates(states));
text_dc.DrawText(text, pt); text_dc.DrawText(text, pt);
} }
} }
void SideButton::messureSize() void SideButton::messureSize()