From 0803186472b4cb70562f3aa7d33377a2de0d15aa Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Mon, 13 Jan 2025 18:11:08 +0800 Subject: [PATCH] FIX: update dark mode text color jira: [STUDIO-9781] Change-Id: Ief8c0d820beb698ae19057fba4ad21ef3278f6a9 (cherry picked from commit 20d62fe504e772d2e41d7a86989dc22faba10c15) --- src/slic3r/GUI/PrintOptionsDialog.cpp | 4 ++-- src/slic3r/GUI/StatusPanel.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index 4728005719..17e48c42ae 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -532,7 +532,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")); @@ -577,7 +577,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")); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 447fef60a0..a5dd950992 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -2860,9 +2860,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 @@ -4759,7 +4759,7 @@ void StatusPanel::on_nozzle_selected(wxCommandEvent &event) return; } } - + m_nozzle_btn_panel->Enable(); }