juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-06 07:11:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

speed control popup

Browse Source
This commit is contained in:
yw4z
2026-09-11 00:12:53 +03:00
parent 1523ba24c0
commit 71eff749ae
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/StatusPanel.cpp
+4 -1
View File
@@ -4810,11 +4810,14 @@ void StatusPanel::on_switch_speed(wxCommandEvent &event)
#endif
popUp->SetBackgroundColour(StateColor::darkModeColorFor(0xeeeeee));
StepCtrl *step = new StepCtrl(popUp, wxID_ANY);
step->SetBackgroundColor(StateColor::darkModeColorFor(0xFFFFFF));
step->SetBorderWidth(2);
step->SetBorderColor(StateColor::darkModeColorFor(wxColour("#009688")));
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(step, 1, wxEXPAND, 0);
popUp->SetSizer(sizer);
auto em = em_unit(this);
popUp->SetSize(em * 36, em * 8);
popUp->SetSize(em * 36, em * 10);
step->SetHint(_L("This only takes effect during printing"));
step->AppendItem(_L("Silent"), "");
step->AppendItem(_L("Standard"), "");
src/slic3r/GUI/Widgets/StepCtrl.cpp
+17 -7
View File
@@ -24,8 +24,8 @@ StepCtrlBase::StepCtrlBase(wxWindow * parent,
, clr_bar(0xACACAC)
, clr_step(0xACACAC)
, clr_text(std::make_pair(0x009688, (int) StateColor::Checked),
std::make_pair(0x6B6B6B, (int) StateColor::Normal))
, clr_tip(0x828280)
std::make_pair(0x363636, (int) StateColor::Normal))
, clr_tip(0x363636)
{
SetFont(Label::Body_14);
border_color = StateColor(*wxLIGHT_GREY);
@@ -220,8 +220,6 @@ void StepCtrl::doRender(wxDC &dc)
dc.DrawRectangle(rcBar);
int circleX = itemWidth / 2;
int circleY = size.y / 2;
dc.SetPen(wxPen(clr_step.colorForStates(states)));
dc.SetBrush(wxBrush(clr_step.colorForStates(states)));
if (!hint.empty()) {
dc.SetFont(font_tip);
dc.SetTextForeground(clr_tip.colorForStates(states));
@@ -230,6 +228,8 @@ void StepCtrl::doRender(wxDC &dc)
}
for (int i = 0; i < steps.size(); ++i) {
bool check = (pos_thumb == wxPoint{0, 0} ? step : pos_thumb.y) == i;
dc.SetPen(wxPen(clr_step.colorForStates(states)));
dc.SetBrush(wxBrush(clr_step.colorForStates(states)));
dc.DrawEllipse(circleX - radius, circleY - radius, radius * 2, radius * 2);
dc.SetFont(GetFont());
dc.SetTextForeground(clr_text.colorForStates(states | (check ? StateColor::Checked : 0)));
@@ -240,8 +240,18 @@ void StepCtrl::doRender(wxDC &dc)
dc.SetTextForeground(clr_tip.colorForStates(states));
wxSize sz = dc.GetTextExtent(tips[i]);
dc.DrawText(tips[i], circleX - sz.x / 2, circleY - 20 - sz.y);
sz = bmp_thumb.GetBmpSize();
dc.DrawBitmap(bmp_thumb.bmp(), circleX - sz.x / 2, circleY - sz.y / 2);
// ORCA draw thumb directly to support dark mode colors
dc.SetPen(wxPen(background_color.colorForStates(0), FromDIP(2)));
dc.SetBrush(wxBrush(clr_text.colorForStates(StateColor::Checked)));
dc.DrawCircle(wxPoint(circleX, circleY), FromDIP(12));
dc.SetPen(wxPen(background_color.colorForStates(0)));
for (int dx = -1; dx <= 1; ++dx) {
int x = circleX + dx * FromDIP(4);
dc.DrawLine(wxPoint(x, circleY - FromDIP(4)), wxPoint(x, circleY + FromDIP(4)));
}
}
circleX += itemWidth;
}
@@ -262,7 +272,7 @@ StepIndicator::StepIndicator(wxWindow *parent, wxWindowID id, const wxPoint &pos
clr_text = StateColor(
std::make_pair(0xACACAC, (int) StateColor::Disabled),
std::make_pair(0x323A3D, (int) StateColor::Checked),
std::make_pair(0x6B6B6B, 0));
std::make_pair(0x363636, 0));
clr_tip = *wxWHITE;
StaticBox::border_width = 0;
radius = bmp_ok.GetBmpHeight() / 2;