diff --git a/src/gui/wxgui/GraphicPacksWindow2.cpp b/src/gui/wxgui/GraphicPacksWindow2.cpp index 96b939bb..e70e2a9e 100644 --- a/src/gui/wxgui/GraphicPacksWindow2.cpp +++ b/src/gui/wxgui/GraphicPacksWindow2.cpp @@ -131,11 +131,11 @@ void GraphicPacksWindow2::FillGraphicPackList() const { auto tmp_text = m_graphic_pack_tree->GetItemText(node); m_graphic_pack_tree->SetItemText(node, tmp_text + " (Unsupported version)"); - m_graphic_pack_tree->SetItemTextColour(node, 0x0000CC); + m_graphic_pack_tree->SetItemTextColour(node, m_incompatible_colour); canEnable = false; } else if (p->IsActivated()) - m_graphic_pack_tree->SetItemTextColour(node, 0x009900); + m_graphic_pack_tree->SetItemTextColour(node, m_activated_colour); m_graphic_pack_tree->MakeCheckable(node, p->IsEnabled()); if (!canEnable) @@ -509,7 +509,7 @@ void GraphicPacksWindow2::OnTreeChoiceChanged(wxTreeEvent& event) if (!requiresRestart) { ReloadPack(graphic_pack); - m_graphic_pack_tree->SetItemTextColour(item, 0x009900); + m_graphic_pack_tree->SetItemTextColour(item, m_activated_colour); } } else @@ -517,7 +517,7 @@ void GraphicPacksWindow2::OnTreeChoiceChanged(wxTreeEvent& event) if (!requiresRestart) { DeleteShadersFromRuntimeCache(graphic_pack); - m_graphic_pack_tree->SetItemTextColour(item, *wxBLACK); + m_graphic_pack_tree->SetItemTextColour(item, m_default_colour); } GraphicPack2::DeactivateGraphicPack(graphic_pack); } diff --git a/src/gui/wxgui/GraphicPacksWindow2.h b/src/gui/wxgui/GraphicPacksWindow2.h index a79c62c1..435d1031 100644 --- a/src/gui/wxgui/GraphicPacksWindow2.h +++ b/src/gui/wxgui/GraphicPacksWindow2.h @@ -53,6 +53,9 @@ private: std::string m_gp_name, m_gp_description; float m_ratio = 0.55f; + wxColour m_default_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + wxColour m_activated_colour = wxSystemSettings::SelectLightDark(wxColour(0x00, 0xCC, 0x00), wxColour(0x42, 0xB3, 0x42)); + wxColour m_incompatible_colour = wxSystemSettings::SelectLightDark(wxColour(0xCC, 0x00, 0x00), wxColour(0xDE, 0x49, 0x49)); wxTreeItemId FindTreeItem(const wxTreeItemId& root, const wxString& text) const; void LoadPresetSelections(const GraphicPackPtr& gp);