3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 20:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

4
src/slic3r/GUI/StatusPanel.cpp
View file

@ -742,7 +742,7 @@ wxBoxSizer *StatusBasePanel::create_misc_control(wxWindow *parent)
m_switch_nozzle_fan->SetLabels(_L("Part Cooling"), _L("Part Cooling")); m_switch_nozzle_fan->SetLabels(_L("Part Cooling"), _L("Part Cooling"));
m_switch_nozzle_fan->SetPadding(FromDIP(3)); m_switch_nozzle_fan->SetPadding(FromDIP(3));
m_switch_nozzle_fan->SetBorderWidth(FromDIP(2)); m_switch_nozzle_fan->SetBorderWidth(FromDIP(2));
m_switch_nozzle_fan->SetFont(SWITCH_FONT); m_switch_nozzle_fan->SetFont(::Label::Body_10);
m_switch_nozzle_fan->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_FAN_TEXT_COL, (int) StateColor::Normal))); m_switch_nozzle_fan->SetTextColor(StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_FAN_TEXT_COL, (int) StateColor::Normal)));
line_sizer->Add(m_switch_nozzle_fan, 1, wxALIGN_CENTER | wxALL, 0); line_sizer->Add(m_switch_nozzle_fan, 1, wxALIGN_CENTER | wxALL, 0);
@ -755,7 +755,7 @@ wxBoxSizer *StatusBasePanel::create_misc_control(wxWindow *parent)
m_switch_printing_fan->SetMinSize(MISC_BUTTON_SIZE); m_switch_printing_fan->SetMinSize(MISC_BUTTON_SIZE);
m_switch_printing_fan->SetPadding(FromDIP(3)); m_switch_printing_fan->SetPadding(FromDIP(3));
m_switch_printing_fan->SetBorderWidth(FromDIP(2)); m_switch_printing_fan->SetBorderWidth(FromDIP(2));
m_switch_printing_fan->SetFont(SWITCH_FONT); m_switch_printing_fan->SetFont(::Label::Body_10);
m_switch_printing_fan->SetLabels(_L("Aux Cooling"), _L("Aux Cooling")); m_switch_printing_fan->SetLabels(_L("Aux Cooling"), _L("Aux Cooling"));
m_switch_printing_fan->SetTextColor( m_switch_printing_fan->SetTextColor(
StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_FAN_TEXT_COL, (int) StateColor::Normal))); StateColor(std::make_pair(DISCONNECT_TEXT_COL, (int) StateColor::Disabled), std::make_pair(NORMAL_FAN_TEXT_COL, (int) StateColor::Normal)));

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

@ -171,7 +171,9 @@ void SideButton::paintEvent(wxPaintEvent& evt)
#else #else
wxDC & dc2(dc); wxDC & dc2(dc);
#endif #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 * method so that it can work no matter what type of DC
* (e.g. wxPaintDC or wxClientDC) is used. * (e.g. wxPaintDC or wxClientDC) is used.
*/ */
void SideButton::render(wxDC& dc) void SideButton::dorender(wxDC& dc, wxDC& text_dc)
{ {
wxSize size = GetSize(); wxSize size = GetSize();
@ -266,9 +268,10 @@ void SideButton::render(wxDC& 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;
dc.SetFont(GetFont());
dc.SetTextForeground(text_color.colorForStates(states)); text_dc.SetFont(GetFont());
dc.DrawText(text, pt); text_dc.SetTextForeground(text_color.colorForStates(states));
text_dc.DrawText(text, pt);
} }
} }

2
src/slic3r/GUI/Widgets/SideButton.hpp
View file

@ -79,7 +79,7 @@ private:
void paintEvent(wxPaintEvent& evt); void paintEvent(wxPaintEvent& evt);
void render(wxDC& dc); void dorender(wxDC& dc, wxDC& text_dc);
void messureSize(); void messureSize();