From cbc1485b57871c28259d3782429a9ae80962a640 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Sat, 18 Jan 2025 11:38:12 +0800 Subject: [PATCH] FIX:fix SyncNozzleAndAmsDialog display in dark mode jira: STUDIO-9937 Change-Id: Ic31456ceb6998aceb010b2a4a3f879ec5bec836c (cherry picked from commit d1a255db914e1a05225189cdd1ccbee205ebe4ee) --- src/slic3r/GUI/SyncAmsInfoDialog.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 967be925b6..27a03a7a28 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -4378,7 +4378,7 @@ SyncNozzleAndAmsDialog::SyncNozzleAndAmsDialog(wxWindow *parent, InputInfo &inpu m_button_ok = new Button(this, _L("Sync AMS filament")); m_button_ok->SetBackgroundColor(btn_bg_green); m_button_ok->SetBorderWidth(0); - m_button_ok->SetTextColor(wxColour(0xFFFFFF)); + m_button_ok->SetTextColor(wxColour(0xFEFEFE)); m_button_ok->SetFont(Label::Body_12); m_button_ok->SetSize(wxSize(FromDIP(60), FromDIP(30))); m_button_ok->SetMinSize(wxSize(FromDIP(90), FromDIP(30))); @@ -4394,7 +4394,7 @@ SyncNozzleAndAmsDialog::SyncNozzleAndAmsDialog(wxWindow *parent, InputInfo &inpu m_button_cancel->SetBackgroundColor(btn_bg_white); m_button_cancel->SetBorderColor(wxColour(93, 93, 91)); m_button_cancel->SetFont(Label::Body_12); - m_button_cancel->SetTextColor(wxColour(0xFFFFFF)); + m_button_cancel->SetTextColor(wxColour(0xFEFEFE)); m_button_cancel->SetSize(wxSize(FromDIP(65), FromDIP(30))); m_button_cancel->SetMinSize(wxSize(FromDIP(65), FromDIP(30))); m_button_cancel->SetCornerRadius(FromDIP(6)); @@ -4409,7 +4409,6 @@ SyncNozzleAndAmsDialog::SyncNozzleAndAmsDialog(wxWindow *parent, InputInfo &inpu SetSizer(m_sizer_main); Layout(); Fit(); - wxGetApp().UpdateFrameDarkUI(this); } SyncNozzleAndAmsDialog::~SyncNozzleAndAmsDialog() {} @@ -4482,7 +4481,7 @@ FinishSyncAmsDialog::FinishSyncAmsDialog(wxWindow *parent, InputInfo &input_info m_button_ok = new Button(this, _CTX(L_CONTEXT("OK", "FinishSyncAms"), "FinishSyncAms")); m_button_ok->SetBackgroundColor(btn_bg_green); m_button_ok->SetBorderWidth(0); - m_button_ok->SetTextColor(wxColour(0xFFFFFF)); + m_button_ok->SetTextColor(wxColour(0xFEFEFE)); m_button_ok->SetFont(Label::Body_12); m_button_ok->SetSize(wxSize(FromDIP(68), FromDIP(30))); m_button_ok->SetMinSize(wxSize(FromDIP(68), FromDIP(30))); @@ -4508,7 +4507,6 @@ FinishSyncAmsDialog::FinishSyncAmsDialog(wxWindow *parent, InputInfo &input_info SetSizer(m_sizer_main); Layout(); Fit(); - wxGetApp().UpdateFrameDarkUI(this); } FinishSyncAmsDialog::~FinishSyncAmsDialog() {} void FinishSyncAmsDialog::on_dpi_changed(const wxRect &suggested_rect)