Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix object's list text color on Linux (GH-2086) #2346

Merged
merged 2 commits into from
Oct 8, 2023
Merged

Fix object's list text color on Linux (GH-2086) #2346

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
234e63a
Fix object's list text color on Linux (GH-2086)
mdziekon Oct 7, 2023
561ee0f
Merge branch 'main' into gh-2086/fix-linux-darkmode-objects-list
SoftFever Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/slic3r/GUI/GUI_ObjectList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,13 @@ ObjectList::ObjectList(wxWindow* parent) :
wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE)
{
wxGetApp().UpdateDVCDarkUI(this, true);

#ifdef __linux__
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

// Temporary fix for incorrect dark mode application regarding list item's text color.
// See: https://github.com/SoftFever/OrcaSlicer/issues/2086
this->SetForegroundColour(*wxBLACK);
#endif

SetFont(Label::sysFont(13));
#ifdef __WXMSW__
GenericGetHeader()->SetFont(Label::sysFont(13));
Expand Down