From 017c8b5c933f8f959151f8db9f93cb8429cd1a48 Mon Sep 17 00:00:00 2001 From: "wenjie.guo" Date: Thu, 19 Oct 2023 17:38:06 +0800 Subject: [PATCH] FIX: The display of _ is not clear in dark mode jira: STUDIO-4525 In dark mode, the second '_' in the cavity temperature '_/_' display is not clear. Signed-off-by: wenjie.guo Change-Id: I43547371d4c824c2820eb0cb88d67dd2c4dc4678 --- src/slic3r/GUI/StatusPanel.cpp | 8 +++++++- src/slic3r/GUI/Widgets/TempInput.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index f0ba9fcd2..cc6a86da5 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1958,9 +1958,14 @@ void StatusPanel::update(MachineObject *obj) if (obj->is_support_chamber_edit) { m_tempCtrl_chamber->SetReadOnly(false); m_tempCtrl_chamber->Enable(); + wxCursor cursor(wxCURSOR_IBEAM); + m_tempCtrl_chamber->GetTextCtrl()->SetCursor(cursor); } else { m_tempCtrl_chamber->SetReadOnly(true); + wxCursor cursor(wxCURSOR_ARROW); + m_tempCtrl_chamber->GetTextCtrl()->SetCursor(cursor); + if (obj->get_printer_series() == PrinterSeries::SERIES_X1) { m_tempCtrl_chamber->SetTagTemp(TEMP_BLANK_STR); }if (obj->get_printer_series() == PrinterSeries::SERIES_P1P) @@ -1969,7 +1974,8 @@ void StatusPanel::update(MachineObject *obj) m_tempCtrl_chamber->GetTextCtrl()->SetValue(TEMP_BLANK_STR); } - m_tempCtrl_chamber->Disable(); + //m_tempCtrl_chamber->Disable(); + } if (!obj->dev_connection_type.empty()) { diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp index fb848afdc..852b800ed 100644 --- a/src/slic3r/GUI/Widgets/TempInput.cpp +++ b/src/slic3r/GUI/Widgets/TempInput.cpp @@ -117,7 +117,7 @@ void TempInput::Create(wxWindow *parent, wxString text, wxString label, wxString } }); text_ctrl->SetFont(Label::Body_13); - text_ctrl->SetForegroundColour(text_color.colorForStates(StateColor::Normal)); + text_ctrl->SetForegroundColour(StateColor::darkModeColorFor(*wxBLACK)); if (!normal_icon.IsEmpty()) { this->normal_icon = ScalableBitmap(this, normal_icon.ToStdString(), 16); } if (!actice_icon.IsEmpty()) { this->actice_icon = ScalableBitmap(this, actice_icon.ToStdString(), 16); } this->degree_icon = ScalableBitmap(this, "degree", 16);