juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:fixed some issues about text

Browse Source 
1.part cooling cross the border
2.the text on the upper-right menu is not clear

Change-Id: I41e07053d7a4b9d3dc574d380a1af7808362d276
This commit is contained in:
tao wang
2022-10-13 18:27:35 +08:00
committed by Lane.Wei
parent 4172ad8a8e
commit 4918c4d643
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,9 @@ void SideButton::paintEvent(wxPaintEvent& evt)
#else
wxDC & dc2(dc);
#endif
render(dc2);
wxDC & dctext(dc);
dorender(dc2, dctext);
}
/*
@@ -179,7 +181,7 @@ void SideButton::paintEvent(wxPaintEvent& evt)
* method so that it can work no matter what type of DC
* (e.g. wxPaintDC or wxClientDC) is used.
*/
void SideButton::render(wxDC& dc)
void SideButton::dorender(wxDC& dc, wxDC& text_dc)
{
wxSize size = GetSize();
@@ -266,9 +268,10 @@ void SideButton::render(wxDC& dc)
auto text = GetLabel();
if (!text.IsEmpty()) {
pt.y += (rcContent.height - textSize.y) / 2;
dc.SetFont(GetFont());
dc.SetTextForeground(text_color.colorForStates(states));
dc.DrawText(text, pt);
text_dc.SetFont(GetFont());
text_dc.SetTextForeground(text_color.colorForStates(states));
text_dc.DrawText(text, pt);
}
}