juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-28 12:29:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

match style of dialog buttons

Browse Source
This commit is contained in:
yw4z
2026-08-25 00:04:14 +03:00
parent fbe4cdff23
commit 2f9ef86e97
2 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/ColorDecomposeDialog.cpp
View File

@@ -553,24 +553,11 @@ wxBoxSizer* ColorDecomposeDialog::create_button_panel()
sizer->AddStretchSpacer(); sizer->AddStretchSpacer();
m_btn_cancel = new Button(this, _L("Cancel")); m_btn_cancel = new Button(this, _L("Cancel"));
m_btn_cancel->SetBackgroundColor(*wxWHITE); m_btn_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
m_btn_cancel->SetBorderColor(wxColour("#CECECE"));
m_btn_cancel->SetTextColor(COLOR_TEXT_DARK);
m_btn_cancel->SetMinSize(wxSize(FromDIP(55), FromDIP(24)));
m_btn_cancel->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_CANCEL); }); m_btn_cancel->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_CANCEL); });
m_btn_ok = new Button(this, _L("OK")); m_btn_ok = new Button(this, _L("OK"));
m_btn_ok->SetBackgroundColor(StateColor( m_btn_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
std::make_pair(wxColour("#CECECE"), (int) StateColor::Disabled),
std::make_pair(wxColour(0, 137, 123), (int) StateColor::Pressed),
std::make_pair(COLOR_BRAND, (int) StateColor::Normal)));
m_btn_ok->SetBorderColor(StateColor(
std::make_pair(wxColour("#CECECE"), (int) StateColor::Disabled),
std::make_pair(COLOR_BRAND, (int) StateColor::Normal)));
// Off-by-one white: plain #FFFFFF is a dark-mode key and would repaint the
// label as the window background on the accent fill.
m_btn_ok->SetTextColor(wxColour("#FFFFFE"));
m_btn_ok->SetMinSize(wxSize(FromDIP(55), FromDIP(24)));
m_btn_ok->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { m_btn_ok->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) {
EndModal(wxID_OK); EndModal(wxID_OK);
}); });

15
src/slic3r/GUI/MixedFilamentDialog.cpp
View File

@@ -1369,22 +1369,11 @@ wxBoxSizer* MixedFilamentDialog::create_button_panel()
auto* sizer = new wxBoxSizer(wxHORIZONTAL); auto* sizer = new wxBoxSizer(wxHORIZONTAL);
m_btn_cancel = new Button(this, _L("Cancel")); m_btn_cancel = new Button(this, _L("Cancel"));
m_btn_cancel->SetBackgroundColor(*wxWHITE); m_btn_cancel->SetStyle(ButtonStyle::Regular, ButtonType::Choice);
m_btn_cancel->SetBorderColor(wxColour("#CECECE"));
m_btn_cancel->SetTextColor(wxColour("#262E30"));
m_btn_cancel->SetMinSize(wxSize(FromDIP(55), FromDIP(24)));
m_btn_cancel->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_CANCEL); }); m_btn_cancel->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_CANCEL); });
m_btn_ok = new Button(this, _L("OK")); m_btn_ok = new Button(this, _L("OK"));
m_btn_ok->SetBackgroundColor(StateColor( m_btn_ok->SetStyle(ButtonStyle::Confirm, ButtonType::Choice);
std::make_pair(wxColour("#CECECE"), (int) StateColor::Disabled),
std::make_pair(wxColour(0, 137, 123), (int) StateColor::Pressed),
std::make_pair(wxColour("#009688"), (int) StateColor::Normal)));
m_btn_ok->SetBorderColor(StateColor(
std::make_pair(wxColour("#CECECE"), (int) StateColor::Disabled),
std::make_pair(wxColour("#009688"), (int) StateColor::Normal)));
m_btn_ok->SetTextColor(wxColour("#FFFFFE"));
m_btn_ok->SetMinSize(wxSize(FromDIP(55), FromDIP(24)));
m_btn_ok->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_OK); }); m_btn_ok->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { EndModal(wxID_OK); });
sizer->Add(m_btn_cancel, 0, wxRIGHT, FromDIP(12)); sizer->Add(m_btn_cancel, 0, wxRIGHT, FromDIP(12));