Merge pull request #4939 from sjnewbury/gamelist-text

Always use visible text in GameList
dolphin-emu · Mar 8, 2017 · 883bec8 · 883bec8
2 parents 5acf2c8 + 28f4793
commit 883bec8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp
@@ -624,8 +624,8 @@ void CGameListCtrl::InsertItemInReportView(long index)
       UpdateItemAtColumn(item_index, i);
   }
 
-  // Background color
-  SetBackgroundColor();
+  // List colors
+  SetColors();
 }
 
 static wxColour blend50(const wxColour& c1, const wxColour& c2)
@@ -638,14 +638,23 @@ static wxColour blend50(const wxColour& c1, const wxColour& c2)
   return a << 24 | b << 16 | g << 8 | r;
 }
 
-void CGameListCtrl::SetBackgroundColor()
+static wxColour ContrastText(const wxColour& bgc)
+{
+  // Luminance threshold to determine whether to use black text on light background
+  static constexpr int LUM_THRESHOLD = 186;
+  int lum = 0.299 * bgc.Red() + 0.587 * bgc.Green() + 0.114 * bgc.Blue();
+  return (lum > LUM_THRESHOLD) ? *wxBLACK : *wxWHITE;
+}
+
+void CGameListCtrl::SetColors()
 {
   for (long i = 0; i < GetItemCount(); i++)
   {
     wxColour color = (i & 1) ? blend50(wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT),
                                        wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)) :
                                wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
     CGameListCtrl::SetItemBackgroundColour(i, color);
+    SetItemTextColour(i, ContrastText(color));
   }
 }
 
@@ -796,7 +805,7 @@ void CGameListCtrl::OnColumnClick(wxListEvent& event)
     SortItems(wxListCompare, last_sort);
   }
 
-  SetBackgroundColor();
+  SetColors();
 
   event.Skip();
 }

diff --git a/Source/Core/DolphinWX/GameListCtrl.h b/Source/Core/DolphinWX/GameListCtrl.h
@@ -73,7 +73,7 @@ class CGameListCtrl : public wxListCtrl
   void InitBitmaps();
   void UpdateItemAtColumn(long _Index, int column);
   void InsertItemInReportView(long _Index);
-  void SetBackgroundColor();
+  void SetColors();
   void ScanForISOs();
 
   // events