juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: support dark mode for print option

Browse Source 
jira: [STUDIO-9431]
Change-Id: I9b57f684e5a0b21a3f82b2138f568dd233b8d718
(cherry picked from commit 2a07fcf8b9eb7e6a3c3c104ac2eb9de51380aec0)
This commit is contained in:
xin.zhang
2025-01-01 12:15:57 +08:00
committed by Noisyfox
parent 285927574e
commit c259360dff
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -4535,7 +4535,7 @@ std::string SelectMachineDialog::get_print_status_info(PrintDialogStatus status)
m_ops = ops; m_ops = ops;
m_param = param; m_param = param;
SetBackgroundColour(*wxWHITE); SetBackgroundColour(PRINT_OPT_BG_GRAY);
wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *top_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *top_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -4594,7 +4594,7 @@ void PrintOption::doRender(wxDC &dc)
{ {
auto size = GetSize(); auto size = GetSize();
dc.SetPen(wxPen(*wxTRANSPARENT_PEN)); dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
dc.SetBrush(wxBrush(0xF8F8F8)); dc.SetBrush(GetBackgroundColour());
dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3); dc.DrawRoundedRectangle(0, 0, size.x, size.y, 3);
} }
@@ -4630,6 +4630,7 @@ PrintOptionItem::PrintOptionItem(wxWindow *parent, std::vector<POItem> ops, std:
m_ops = ops; m_ops = ops;
m_param = param; m_param = param;
SetBackgroundColour(PRINT_OPT_ITEM_BG_GRAY);
Bind(wxEVT_PAINT, &PrintOptionItem::OnPaint, this); Bind(wxEVT_PAINT, &PrintOptionItem::OnPaint, this);
auto width = ops.size() * FromDIP(56) + FromDIP(8); auto width = ops.size() * FromDIP(56) + FromDIP(8);
@@ -4708,7 +4709,7 @@ void PrintOptionItem::doRender(wxDC &dc)
{ {
auto size = GetSize(); auto size = GetSize();
dc.SetPen(wxPen(*wxTRANSPARENT_PEN)); dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
dc.SetBrush(wxBrush(0xEBEBEB)); dc.SetBrush(GetBackgroundColour());
dc.DrawRoundedRectangle(0, 0, size.x, size.y, 5); dc.DrawRoundedRectangle(0, 0, size.x, size.y, 5);
auto left = FromDIP(4); auto left = FromDIP(4);
@@ -4730,8 +4731,11 @@ void PrintOptionItem::doRender(wxDC &dc)
auto text_value = it->value; auto text_value = it->value;
if (text_key == selected_key) { if (text_key == selected_key) {
dc.SetPen(wxPen(0x00AE42));
dc.SetTextForeground(0x00AE42); const wxColour& clr = wxGetApp().dark_mode() ? StateColor::darkModeColorFor("#00AE42") : "#00AE42";
dc.SetPen(wxPen(clr));
dc.SetTextForeground(clr);
dc.SetFont(::Label::Head_13); dc.SetFont(::Label::Head_13);
auto text_size = dc.GetTextExtent(text_value); auto text_size = dc.GetTextExtent(text_value);
auto text_left = left + (FromDIP(56) - text_size.x) / 2; auto text_left = left + (FromDIP(56) - text_size.x) / 2;
@@ -4739,8 +4743,10 @@ void PrintOptionItem::doRender(wxDC &dc)
dc.DrawText(text_value, wxPoint(text_left, text_top)); dc.DrawText(text_value, wxPoint(text_left, text_top));
} }
else { else {
dc.SetPen(wxPen(*wxBLACK)); const wxColour& clr = wxGetApp().dark_mode() ? StateColor::darkModeColorFor(*wxBLACK) : *wxBLACK;
dc.SetTextForeground(*wxBLACK); dc.SetPen(wxPen(clr));
dc.SetTextForeground(clr);
dc.SetFont(::Label::Body_13); dc.SetFont(::Label::Body_13);
auto text_size = dc.GetTextExtent(text_value); auto text_size = dc.GetTextExtent(text_value);
auto text_left = left + (FromDIP(56) - text_size.x) / 2; auto text_left = left + (FromDIP(56) - text_size.x) / 2;

3
src/slic3r/GUI/SelectMachine.hpp
View File

@@ -44,6 +44,9 @@
#include "Jobs/Worker.hpp" #include "Jobs/Worker.hpp"
#define PRINT_OPT_BG_GRAY 0xF8F8F8
#define PRINT_OPT_ITEM_BG_GRAY 0xEEEEEE
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
void print_ams_mapping_result(std::vector<FilamentInfo> &result); void print_ams_mapping_result(std::vector<FilamentInfo> &result);