mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: update dark mode text color 

jira: [STUDIO-9781]
Change-Id: Ief8c0d820beb698ae19057fba4ad21ef3278f6a9
This commit is contained in:
xin.zhang 2025-01-13 18:11:08 +08:00 committed by lane.wei
parent f8b4949353
commit 20d62fe504
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/PrintOptionsDialog.cpp
View File

@ -534,7 +534,7 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
/*left*/
auto leftTitle = new Label(multiple_panel, _L("Left Nozzle"));
leftTitle->SetFont(::Label::Head_15);
leftTitle->SetForegroundColour(0x2e2630);
leftTitle->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#2C2C2E")));
wxBoxSizer *multiple_left_line_sizer = new wxBoxSizer(wxHORIZONTAL);
auto multiple_left_nozzle_type = new Label(multiple_panel, _L("Nozzle Type"));
@ -579,7 +579,7 @@ PrinterPartsDialog::PrinterPartsDialog(wxWindow* parent)
/*right*/
auto rightTitle = new Label(multiple_panel, _L("Right Nozzle"));
rightTitle->SetFont(::Label::Head_15);
rightTitle->SetForegroundColour(0x2e2630);
rightTitle->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#2C2C2E")));
wxBoxSizer *multiple_right_line_sizer = new wxBoxSizer(wxHORIZONTAL);
auto multiple_right_nozzle_type = new Label(multiple_panel, _L("Nozzle Type"));
@ -921,7 +921,7 @@ bool PrinterPartsDialog::Show(bool show)
if (type == NozzleType::ntHardenedSteel)
{
diameter_map = nozzle_hard_diameter_map;
}
}
else if (type == NozzleType::ntStainlessSteel)
{
diameter_map = nozzle_stainless_diameter_map;

6
src/slic3r/GUI/StatusPanel.cpp
View File

@ -2833,9 +2833,9 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
/*enable status*/
if (obj->is_in_printing() ||
obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE ||
obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE ||
targ_nozzle_id_from_pc != INVALID_NOZZLE_ID)
{
{
m_nozzle_btn_panel->Disable();
}
else
@ -4674,7 +4674,7 @@ void StatusPanel::on_nozzle_selected(wxCommandEvent &event)
return;
}
}
m_nozzle_btn_panel->Enable();
}

12
src/slic3r/GUI/Widgets/StateColor.cpp
View File

@ -5,12 +5,12 @@ static bool gDarkMode = false;
static bool operator<(wxColour const &l, wxColour const &r) { return l.GetRGBA() < r.GetRGBA(); }
static std::map<wxColour, wxColour> gDarkColors{
{"#00AE42", "#21A452"},
{"#1F8EEA", "#2778D2"},
{"#00AE42", "#21A452"},/*green*/
{"#1F8EEA", "#2778D2"},/*blue*/
{"#FF6F00", "#D15B00"},
{"#D01B1B", "#BB2A3A"},
{"#262E30", "#EFEFF0"},
{"#2C2C2E", "#B3B3B4"},
{"#D01B1B", "#BB2A3A"},/*red*/
{"#262E30", "#EFEFF0"},/*black*/
{"#2C2C2E", "#B3B3B4"},/*black*/
{"#6B6B6B", "#818183"},/*gray -> */
{"#ACACAC", "#54545A"},/*gray -> */
{"#EEEEEE", "#4C4C55"},/*gray -> */
@ -42,7 +42,7 @@ static std::map<wxColour, wxColour> gDarkColors{
//{"#F0F0F0", "#4C4C54"},
};
std::map<wxColour, wxColour> const & StateColor::GetDarkMap()
std::map<wxColour, wxColour> const & StateColor::GetDarkMap()
{
return gDarkColors;
}